From: Simon Glass <sjg@chromium.org>
Date: Sat, 18 May 2019 04:00:47 +0000 (-0600)
Subject: binman: Update entry_test to support Python 3
X-Git-Tag: v2019.10-rc1~32^2~37
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0199d19349ee0e5cc65dae4a453eb9c4074fb685;p=oweals%2Fu-boot.git

binman: Update entry_test to support Python 3

The reload() function is in a different place in Python 3. Update the code
to handle this.

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

diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py
index 1f7ff5b4e4..b30a7beecc 100644
--- a/tools/binman/entry_test.py
+++ b/tools/binman/entry_test.py
@@ -41,7 +41,11 @@ class TestEntry(unittest.TestCase):
         del sys.modules['importlib']
         global entry
         if entry:
-            reload(entry)
+            if sys.version_info[0] >= 3:
+                import importlib
+                importlib.reload(entry)
+            else:
+                reload(entry)
         else:
             import entry
         entry.Entry.Create(None, self.GetNode(), 'u-boot-spl')