patman: Tidy up sys.path changes

Now that we are using absolute paths we can remove some of the sys.path
mangling that appears in the tools.

We only need to add the path to 'tools/' so that everything can find
modules relative to that directory.

The special paths for finding pylibfdt remain.

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

diff --git a/tools/binman/main.py b/tools/binman/main.py
index 97a8a02034aaf75c146edd2765bcda7890a944f2..efa7fa8386f158e372860ec6fdf90fef70e25380 100755 (executable)
--- a/tools/binman/main.py
+++ b/tools/binman/main.py
@@ -20,8 +20,9 @@ import unittest
 # Bring in the patman and dtoc libraries (but don't override the first path
 # in PYTHONPATH)
 our_path = os.path.dirname(os.path.realpath(__file__))
-for dirname in ['../patman', '../dtoc', '../concurrencytest', '..']:
-    sys.path.insert(2, os.path.realpath(os.path.join(our_path, dirname)))
+sys.path.insert(2, os.path.join(our_path, '..'))
+
+from patman import test_util
 
 # Bring in the libfdt module
 sys.path.insert(2, 'scripts/dtc/pylibfdt')

diff --git a/tools/buildman/main.py b/tools/buildman/main.py
index 52a83fce7d1d916cb51b71682d839291973868e4..2b714739a20546647333e9e1addeecafdc2bcc70 100755 (executable)
--- a/tools/buildman/main.py
+++ b/tools/buildman/main.py
@@ -16,7 +16,6 @@ import unittest
 # Bring in the patman libraries
 our_path = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(1, os.path.join(our_path, '..'))
-sys.path.insert(2, os.path.join(our_path, '../patman'))
 
 # Our modules
 from buildman import board
@@ -35,7 +34,7 @@ def RunTests(skip_net_tests):
     import doctest
 
     result = unittest.TestResult()
-    for module in ['toolchain', 'gitutil']:
+    for module in ['buildman.toolchain', 'patman.gitutil']:
         suite = doctest.DocTestSuite(module)
         suite.run(result)
 

diff --git a/tools/buildman/test.py b/tools/buildman/test.py
index b37c37b2fa9b5630e7fe9ea74adb427f4020886c..40811ba9f9e73c8bde310a8c41a88fb13db48254 100644 (file)
--- a/tools/buildman/test.py
+++ b/tools/buildman/test.py
@@ -11,7 +11,6 @@ import unittest
 
 # Bring in the patman libraries
 our_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(os.path.join(our_path, '../patman'))
 
 from buildman import board
 from buildman import bsettings

diff --git a/tools/dtoc/main.py b/tools/dtoc/main.py
index 6c63d637a739295312c984c2f70463565209cf5d..b94d9c301f492ae203abe3d0f929e4fc201964ed 100755 (executable)
--- a/tools/dtoc/main.py
+++ b/tools/dtoc/main.py
@@ -32,7 +32,6 @@ import unittest
 
 # Bring in the patman libraries
 our_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(os.path.join(our_path, '../patman'))
 sys.path.append(os.path.join(our_path, '..'))
 
 # Bring in the libfdt module

diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index d68230713e460b3a7d0033f99dcada29bb3b40e8..375e906424c5a29c92f12957780d169e3083419b 100755 (executable)
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -14,8 +14,7 @@ import unittest
 
 # Bring in the patman libraries
 our_path = os.path.dirname(os.path.realpath(__file__))
-for dirname in ['../patman', '..']:
-    sys.path.insert(0, os.path.join(our_path, dirname))
+sys.path.insert(1, os.path.join(our_path, '..'))
 
 from dtoc import fdt
 from dtoc import fdt_util

diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py
index 4f6382bc7ca92c0b80f353537d34fe47f844c3ff..4ee7aa1f891ed9a4e9a08e2a13c8f9468c52abc7 100755 (executable)
--- a/tools/genboardscfg.py
+++ b/tools/genboardscfg.py
@@ -22,8 +22,7 @@ import sys
 import tempfile
 import time
 
-sys.path.insert(1, os.path.join(os.path.dirname(__file__), 'buildman'))
-import kconfiglib
+from buildman import kconfiglib
 
 ### constant variables ###
 OUTPUT_FILE = 'boards.cfg'

diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 0dd8670403ca6387196597bdc889d50b31e07319..36361f9ed1b6c70b05bed13443c750e1d2806e12 100755 (executable)
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -314,8 +314,6 @@ import tempfile
 import threading
 import time
 
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-sys.path.append(os.path.join(os.path.dirname(__file__), 'patman'))
 from buildman import bsettings
 from buildman import kconfiglib
 from buildman import toolchain

diff --git a/tools/patman/main.py b/tools/patman/main.py
index f59367fafbe714de6b832b8eae050433f12becaa..f3d9c0c4348657540a1fdfb35621816b55080289 100755 (executable)
--- a/tools/patman/main.py
+++ b/tools/patman/main.py
@@ -13,7 +13,7 @@ import sys
 import unittest
 
 if __name__ == "__main__":
-    # Allow 'import xxx to work'
+    # Allow 'from patman import xxx to work'
     our_path = os.path.dirname(os.path.realpath(__file__))
     sys.path.append(os.path.join(our_path, '..'))
 

diff --git a/tools/rmboard.py b/tools/rmboard.py
index 1ed2527d0e7986db7b622b76f674388aed3e662f..06c3562ad8110968f897ae6bf3c1bc5cba0200fa 100755 (executable)
--- a/tools/rmboard.py
+++ b/tools/rmboard.py
@@ -30,7 +30,6 @@ import sys
 
 # Bring in the patman libraries
 our_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(os.path.join(our_path, '../tools/patman'))
 
 from patman import command