diff options
| -rw-r--r-- | scripts/lib/image/engine.py | 10 | ||||
| -rw-r--r-- | scripts/lib/wic/conf.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/imager/baseimager.py | 3 | ||||
| -rw-r--r-- | scripts/lib/wic/imager/direct.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/pluginbase.py | 1 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/imager/direct_plugin.py | 4 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 1 | ||||
| -rw-r--r-- | scripts/lib/wic/utils/cmdln.py | 1 | 
8 files changed, 5 insertions, 19 deletions
| diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index 0dc7920967..73e8f8b599 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -30,18 +30,10 @@  import os  import sys -from abc import ABCMeta, abstractmethod -import shlex -import json -import subprocess -import shutil -import os, sys, errno  from wic import msger, creator -from wic.utils import cmdln, misc, errors -from wic.conf import configmgr +from wic.utils import misc  from wic.plugin import pluginmgr -from wic.__version__ import VERSION  from wic.utils.oe import misc diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py index cecf396819..402ed62032 100644 --- a/scripts/lib/wic/conf.py +++ b/scripts/lib/wic/conf.py @@ -19,7 +19,7 @@ import os  from wic import msger  from wic import kickstart -from wic.utils import misc, runner, errors +from wic.utils import misc  def get_siteconf(): diff --git a/scripts/lib/wic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py index 0afbc2cf0c..67a2d0116b 100644 --- a/scripts/lib/wic/imager/baseimager.py +++ b/scripts/lib/wic/imager/baseimager.py @@ -21,10 +21,9 @@ import os  import tempfile  import shutil -from wic import kickstart  from wic import msger  from wic.utils.errors import CreatorError -from wic.utils import misc, runner, fs_related as fs +from wic.utils import runner  class BaseImageCreator(object):      """Base class for image creation. diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index e2f805832b..57b1335a17 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -28,7 +28,7 @@ import os  import shutil  from wic import kickstart, msger -from wic.utils import fs_related, runner, misc +from wic.utils import fs_related  from wic.utils.partitionedfs import Image  from wic.utils.errors import CreatorError, ImageError  from wic.imager.baseimager import BaseImageCreator diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py index 50e442d61c..6d96de2be5 100644 --- a/scripts/lib/wic/pluginbase.py +++ b/scripts/lib/wic/pluginbase.py @@ -16,7 +16,6 @@  # Temple Place - Suite 330, Boston, MA 02111-1307, USA.  from wic import msger -from wic.utils import errors  class _Plugin(object):      class __metaclass__(type): diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py index db01c411ba..eb17e8d7b7 100644 --- a/scripts/lib/wic/plugins/imager/direct_plugin.py +++ b/scripts/lib/wic/plugins/imager/direct_plugin.py @@ -24,10 +24,8 @@  # Tom Zanussi <tom.zanussi (at] linux.intel.com>  # -from wic import msger -from wic.utils import misc, fs_related, errors, runner, cmdln +from wic.utils import errors  from wic.conf import configmgr -from wic.plugin import pluginmgr  import wic.imager.direct as direct  from wic.pluginbase import ImagerPlugin diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 903b478fe8..49d5c8ae82 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -27,7 +27,6 @@  import os  import shutil -from wic.utils.errors import ImageError  from wic import kickstart, msger  from wic.pluginbase import SourcePlugin  from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ diff --git a/scripts/lib/wic/utils/cmdln.py b/scripts/lib/wic/utils/cmdln.py index b099473ee4..d8f1c051ab 100644 --- a/scripts/lib/wic/utils/cmdln.py +++ b/scripts/lib/wic/utils/cmdln.py @@ -43,7 +43,6 @@ import sys  import re  import cmd  import optparse -from pprint import pprint  import sys | 
