binman: Correct some import statements

Some of these were not converted when binman moved to use absolute paths.
Fix them.

Also drop the import of 'test' which is a directory, not a module.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/binman/control.py b/tools/binman/control.py
index 69c36ed658274f8bc6f2788eb5c0420255d29c8b..60e89d3776b25f236134e0d9ecb9273268513cd2 100644 (file)
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -123,7 +123,7 @@ def ReadEntry(image_fname, entry_path, decomp=True):
         data extracted from the entry
     """
     global Image
-    from image import Image
+    from binman.image import Image
 
     image = Image.FromFile(image_fname)
     entry = image.FindEntryPath(entry_path)
@@ -496,7 +496,7 @@ def Binman(args):
         return 0
 
     # Put these here so that we can import this module without libfdt
-    from image import Image
+    from binman.image import Image
     from binman import state
 
     if args.cmd in ['ls', 'extract', 'replace']:

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index fedcc1ada1bc94ce623654c1b72591da05718c6e..5f650b5f94c0d895ad5f8e8c2766ea18e07cd4b4 100644 (file)
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -29,7 +29,7 @@ from dtoc import fdt
 from dtoc import fdt_util
 from binman.etype import fdtmap
 from binman.etype import image_header
-from image import Image
+from binman.image import Image
 from patman import command
 from patman import test_util
 from patman import tools

diff --git a/tools/binman/image_test.py b/tools/binman/image_test.py
index f85c3c51c0f56cd188ed73650bcdf88f0c2ecd6e..e351fa84ab313f4ce2c4862c4b952894289a435c 100644 (file)
--- a/tools/binman/image_test.py
+++ b/tools/binman/image_test.py
@@ -6,7 +6,7 @@
 
 import unittest
 
-from image import Image
+from binman.image import Image
 from patman.test_util import capture_sys_output
 
 class TestImage(unittest.TestCase):

diff --git a/tools/binman/main.py b/tools/binman/main.py
index 3e463b0119b83dc19f43c96f5eba1d159f456f7f..8c1e478d54cea8342a829808c14d70f393c50dba 100755 (executable)
--- a/tools/binman/main.py
+++ b/tools/binman/main.py
@@ -61,7 +61,6 @@ def RunTests(debug, verbosity, processes, test_preserve_dirs, args, toolpath):
     from binman import fdt_test
     from binman import ftest
     from binman import image_test
-    from binman import test
     import doctest
 
     result = unittest.TestResult()