wic: code cleanup: wildcard imports

Here is what PEP8(Style Guide for Python Code) says about this:

Wildcard imports (from <module> import *) should be avoided, as they
make it unclear which names are present in the namespace, confusing
both readers and many automated tools.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 68d1ce2659f0376e447b0d5f17ca8e7cfba75bab..05c26386e788252f7124fafa4e624503213d29a8 100644 (file)
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -42,7 +42,7 @@ from wic.utils import cmdln, misc, errors
 from wic.conf import configmgr
 from wic.plugin import pluginmgr
 from wic.__version__ import VERSION
-from wic.utils.oe.misc import *
+from wic.utils.oe import misc
 
 
 def verify_build_env():
@@ -65,19 +65,19 @@ def find_artifacts(image_name):
     Gather the build artifacts for the current image (the image_name
     e.g. core-image-minimal) for the current MACHINE set in local.conf
     """
-    bitbake_env_lines = get_bitbake_env_lines()
+    bitbake_env_lines = misc.get_bitbake_env_lines()
 
     rootfs_dir = kernel_dir = bootimg_dir = native_sysroot = ""
 
     for line in bitbake_env_lines.split('\n'):
-        if (get_line_val(line, "IMAGE_ROOTFS")):
-            rootfs_dir = get_line_val(line, "IMAGE_ROOTFS")
+        if (misc.get_line_val(line, "IMAGE_ROOTFS")):
+            rootfs_dir = misc.get_line_val(line, "IMAGE_ROOTFS")
             continue
-        if (get_line_val(line, "DEPLOY_DIR_IMAGE")):
-            kernel_dir = get_line_val(line, "DEPLOY_DIR_IMAGE")
+        if (misc.get_line_val(line, "DEPLOY_DIR_IMAGE")):
+            kernel_dir = misc.get_line_val(line, "DEPLOY_DIR_IMAGE")
             continue
-        if (get_line_val(line, "STAGING_DIR_NATIVE")):
-            native_sysroot = get_line_val(line, "STAGING_DIR_NATIVE")
+        if (misc.get_line_val(line, "STAGING_DIR_NATIVE")):
+            native_sysroot = misc.get_line_val(line, "STAGING_DIR_NATIVE")
             continue
 
     return (rootfs_dir, kernel_dir, bootimg_dir, native_sysroot)
@@ -87,7 +87,7 @@ CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts
 SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
 
 def build_canned_image_list(dl):
-    layers_path = get_bitbake_var("BBLAYERS")
+    layers_path = misc.get_bitbake_var("BBLAYERS")
     canned_wks_layer_dirs = []
 
     if layers_path is not None:

diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 0e687bd70e9452d677507fef1ee494669cd44fd8..9a7d0f51175f0fa97837e2298cb5c21df71b6506 100644 (file)
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -32,7 +32,6 @@ from wic.utils import fs_related, runner, misc
 from wic.utils.partitionedfs import Image
 from wic.utils.errors import CreatorError, ImageError
 from wic.imager.baseimager import BaseImageCreator
-from wic.utils.oe.misc import *
 from wic.plugin import pluginmgr
 
 disk_methods = {

diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index 41a80175ca0231f5384200ea434e712e5a49a23d..9872d209854c2498a13359c3e2353f539a92796d 100644 (file)
--- a/scripts/lib/wic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -20,7 +20,7 @@ import os, sys
 from wic import msger
 from wic import pluginbase
 from wic.utils import errors
-from wic.utils.oe.misc import *
+from wic.utils.oe.misc import get_bitbake_var
 
 __ALL__ = ['PluginMgr', 'pluginmgr']
 

diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 883378ee844817b815e3852483c46d3fe2b4c984..2fc0357a5c835a3ac9bfec8eb8c16e9c29738d50 100644 (file)
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -29,13 +29,9 @@ import shutil
 
 from wic.utils.errors import ImageError
 from wic import kickstart, msger
-from wic.utils import misc, fs_related, errors, runner, cmdln
-from wic.conf import configmgr
-from wic.plugin import pluginmgr
-import wic.imager.direct as direct
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import *
-from wic.imager.direct import DirectImageCreator
+from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
+                              BOOTDD_EXTRA_SPACE
 
 class BootimgEFIPlugin(SourcePlugin):
     name = 'bootimg-efi'

diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index c5eb7b8b801ba0c5c7be7954dcaab0c6942fbb5b..909e59b6e27ccfb60283f89787be8a6be5fc138f 100644 (file)
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -28,7 +28,7 @@ import re
 
 from wic import msger
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import *
+from wic.utils.oe.misc import exec_cmd, get_bitbake_var
 from glob import glob
 
 class BootimgPartitionPlugin(SourcePlugin):

diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 2280867308123a4504d5aa9b92b3443366056c95..9c638554c0e66e9d90fcc59b4ecac915bc8b7330 100644 (file)
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -28,13 +28,10 @@ import os
 
 from wic.utils.errors import ImageError
 from wic import kickstart, msger
-from wic.utils import misc, fs_related, errors, runner, cmdln
-from wic.conf import configmgr
-from wic.plugin import pluginmgr
-import wic.imager.direct as direct
+from wic.utils import runner
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import *
-from wic.imager.direct import DirectImageCreator
+from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \
+                              get_bitbake_var, BOOTDD_EXTRA_SPACE
 
 class BootimgPcbiosPlugin(SourcePlugin):
     name = 'bootimg-pcbios'

diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/scripts/lib/wic/plugins/source/fsimage.py
index 4a090bac42faeaa68fe4575dc792affc68ac0983..ef56cf278b8329603730a5c763fda6cbdd2ea78f 100644 (file)
--- a/scripts/lib/wic/plugins/source/fsimage.py
+++ b/scripts/lib/wic/plugins/source/fsimage.py
@@ -19,7 +19,7 @@ import os
 
 from wic import msger
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import *
+from wic.utils.oe.misc import get_bitbake_var
 
 class FSImagePlugin(SourcePlugin):
     name = 'fsimage'

diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index ca6b721b670ff74fe4eac580200837d1412c766e..444c0268fb4a45148b6a5848b7490a795302cc47 100644 (file)
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -19,7 +19,7 @@ import os
 
 from wic import msger
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import *
+from wic.utils.oe.misc import exec_cmd, get_bitbake_var
 
 class RawCopyPlugin(SourcePlugin):
     name = 'rawcopy'

diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 6f5d9bb19f09f8becd0b0dfb8a7399d6dc41dc77..7d444301fbbfecfe742eaa950417ebb70018a387 100644 (file)
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -27,14 +27,9 @@
 
 import os
 
-from wic import kickstart, msger
-from wic.utils import misc, fs_related, errors, runner, cmdln
-from wic.conf import configmgr
-from wic.plugin import pluginmgr
-import wic.imager.direct as direct
+from wic import msger
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import *
-from wic.imager.direct import DirectImageCreator
+from wic.utils.oe.misc import find_bitbake_env_lines, find_artifact
 
 class RootfsPlugin(SourcePlugin):
     name = 'rootfs'

diff --git a/scripts/lib/wic/utils/fs_related.py b/scripts/lib/wic/utils/fs_related.py
index fb9054d5681bf296810878fe4fe3b40b11520a41..2e74461a4021b20681507e3820e5a90754e7752d 100644 (file)
--- a/scripts/lib/wic/utils/fs_related.py
+++ b/scripts/lib/wic/utils/fs_related.py
@@ -20,10 +20,7 @@ from __future__ import with_statement
 import os
 import errno
 
-from wic import msger
-from wic.utils import runner
-from wic.utils.errors import *
-from wic.utils.oe.misc import *
+from wic.utils.oe.misc import exec_cmd
 
 def makedirs(dirname):
     """A version of os.makedirs() that doesn't throw an

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 40d6e889b0a21d7854afd00aa49eba3f36d2d087..1c9e3eab581a64ce190baacdde5912c57f128492 100644 (file)
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -19,10 +19,8 @@
 # Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 from wic import msger
-from wic.utils import runner
 from wic.utils.errors import ImageError
-from wic.utils.fs_related import *
-from wic.utils.oe.misc import *
+from wic.utils.oe.misc import exec_cmd, exec_native_cmd
 
 # Overhead of the MBR partitioning scheme (just one sector)
 MBR_OVERHEAD = 1

diff --git a/scripts/wic b/scripts/wic
index 7d388c97685912fc8fdebe0bd322cf5899b7d701..1e07dfe922c87ac34bc621edf9ff1ad732fd44ff 100755 (executable)
--- a/scripts/wic
+++ b/scripts/wic
@@ -52,8 +52,9 @@ if bitbake_exe:
 else:
     bitbake_main = None
 
-from image.help import *
-from image.engine import *
+from wic.utils.oe.misc import find_bitbake_env_lines, set_bitbake_env_lines
+from image import engine
+from image import help as hlp
 
 def rootfs_dir_to_args(krootfs_dir):
     """
@@ -132,7 +133,7 @@ def wic_create_subcommand(args, usage_str):
 
     if options.build_check and not options.properties_file:
         print "Checking basic build environment..."
-        if not verify_build_env():
+        if not engine.verify_build_env():
             print "Couldn't verify build environment, exiting\n"
             sys.exit(1)
         else:
@@ -158,7 +159,7 @@ def wic_create_subcommand(args, usage_str):
                 sys.exit(1)
 
         (rootfs_dir, kernel_dir, bootimg_dir, native_sysroot) \
-            = find_artifacts(options.image_name)
+            = engine.find_artifacts(options.image_name)
 
     else:
         if options.build_rootfs:
@@ -168,7 +169,7 @@ def wic_create_subcommand(args, usage_str):
     wks_file = args[0]
 
     if not wks_file.endswith(".wks"):
-        wks_file = find_canned_image(scripts_path, wks_file)
+        wks_file = engine.find_canned_image(scripts_path, wks_file)
         if not wks_file:
             print "No image named %s found, exiting.  (Use 'wic list images' to list available images, or specify a fully-qualified OE kickstart (.wks) filename)\n" % wks_file
             sys.exit(1)
@@ -223,9 +224,9 @@ def wic_create_subcommand(args, usage_str):
     rootfs_dir = rootfs_dir_to_args(krootfs_dir)
 
     print "Creating image(s)...\n"
-    wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
-               native_sysroot, scripts_path, image_output_dir,
-               options.debug, options.properties_file)
+    engine.wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
+                      native_sysroot, scripts_path, image_output_dir,
+                      options.debug, options.properties_file)
 
 
 def wic_list_subcommand(args, usage_str):
@@ -247,7 +248,7 @@ def wic_list_subcommand(args, usage_str):
         sys.exit(1)
     set_bitbake_env_lines(bitbake_env_lines)
 
-    if not wic_list(args, scripts_path, options.properties_file):
+    if not engine.wic_list(args, scripts_path, options.properties_file):
         logging.error("Bad list arguments, exiting\n")
         parser.print_help()
         sys.exit(1)
@@ -268,20 +269,20 @@ wic_help_topic_usage = """
 
 subcommands = {
     "create":    [wic_create_subcommand,
-                  wic_create_usage,
-                  wic_create_help],
+                  hlp.wic_create_usage,
+                  hlp.wic_create_help],
     "list":      [wic_list_subcommand,
-                  wic_list_usage,
-                  wic_list_help],
+                  hlp.wic_list_usage,
+                  hlp.wic_list_help],
     "plugins":   [wic_help_topic_subcommand,
                   wic_help_topic_usage,
-                  wic_plugins_help],
-    "overview":   [wic_help_topic_subcommand,
+                  hlp.wic_plugins_help],
+    "overview":  [wic_help_topic_subcommand,
                   wic_help_topic_usage,
-                  wic_overview_help],
-    "kickstart":  [wic_help_topic_subcommand,
+                  hlp.wic_overview_help],
+    "kickstart": [wic_help_topic_subcommand,
                   wic_help_topic_usage,
-                  wic_kickstart_help],
+                  hlp.wic_kickstart_help],
 }
 
 
@@ -291,7 +292,7 @@ def start_logging(loglevel):
 
 def main(argv):
     parser = optparse.OptionParser(version="wic version %s" % __version__,
-                                   usage=wic_usage)
+                                   usage=hlp.wic_usage)
 
     parser.disable_interspersed_args()
 
@@ -303,7 +304,7 @@ def main(argv):
                 parser.print_help()
                 sys.exit(1)
 
-    invoke_subcommand(args, parser, wic_help_usage, subcommands)
+    hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands)
 
 
 if __name__ == "__main__":