diff options
| author | Simon Glass <sjg@chromium.org> | 2020-08-05 13:27:47 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-08-22 08:53:38 -0600 |
| commit | 07237988dcf88366ce4182eceac698cf1e97afc5 (patch) | |
| tree | 1f45ccc449a1da4e63b55142e5b162e1eac20300 /tools | |
| parent | 87d43329ef7698eab5b090a91228269c39643122 (diff) | |
| download | u-boot-07237988dcf88366ce4182eceac698cf1e97afc5.tar.gz u-boot-07237988dcf88366ce4182eceac698cf1e97afc5.tar.xz u-boot-07237988dcf88366ce4182eceac698cf1e97afc5.zip | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binman/control.py | 4 | ||||
| -rw-r--r-- | tools/binman/ftest.py | 2 | ||||
| -rw-r--r-- | tools/binman/image_test.py | 2 | ||||
| -rwxr-xr-x | tools/binman/main.py | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/tools/binman/control.py b/tools/binman/control.py index 69c36ed658..60e89d3776 100644 --- 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 fedcc1ada1..5f650b5f94 100644 --- 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 f85c3c51c0..e351fa84ab 100644 --- 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 3e463b0119..8c1e478d54 100755 --- 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() |