summaryrefslogtreecommitdiff
path: root/tools/patman/func_test.py
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-04-28 09:52:01 -0400
committerTom Rini <trini@konsulko.com>2020-04-28 09:52:01 -0400
commit545c747447706d9601cc5c65a85ec44e688bfe08 (patch)
tree398a874161673df9656e271a6dbb4b127a45f725 /tools/patman/func_test.py
parent08977f873f4034307796173784fc17a11188a0cb (diff)
parentc1f39edc62adc81775e750957aa557bcf994e607 (diff)
downloadu-boot-545c747447706d9601cc5c65a85ec44e688bfe08.tar.gz
Merge tag 'dm-pull-27apr20' of git://git.denx.de/u-boot-dm
Move Python tools to use absolute paths Minor buildman fixes for new features Make libfdt code more similar to upsteam
Diffstat (limited to 'tools/patman/func_test.py')
-rw-r--r--tools/patman/func_test.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py
index 76319fff37..b7e2825de8 100644
--- a/tools/patman/func_test.py
+++ b/tools/patman/func_test.py
@@ -12,15 +12,12 @@ import sys
import tempfile
import unittest
-try:
- from StringIO import StringIO
-except ImportError:
- from io import StringIO
-
-import gitutil
-import patchstream
-import settings
-import tools
+from io import StringIO
+
+from patman import gitutil
+from patman import patchstream
+from patman import settings
+from patman import tools
@contextlib.contextmanager