diff options
author | Simon Glass <sjg@chromium.org> | 2019-10-31 16:42:59 +0300 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2019-11-05 04:15:32 +0300 |
commit | b4cf5f1df741e8781bed6149291823cd1a4b8baa (patch) | |
tree | 3128d78456e1b6877c23b42a59937399cdda839b /tools/binman/entry.py | |
parent | 5effab0549da404e0f2c21a3f7585aa643f54fc8 (diff) | |
download | u-boot-b4cf5f1df741e8781bed6149291823cd1a4b8baa.tar.xz |
pylibfdt: Convert to Python 3
Build this swig module with Python 3.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman/entry.py')
-rw-r--r-- | tools/binman/entry.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 409c0dca93..5bf5be4794 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -7,16 +7,7 @@ from __future__ import print_function from collections import namedtuple - -# importlib was introduced in Python 2.7 but there was a report of it not -# working in 2.7.12, so we work around this: -# http://lists.denx.de/pipermail/u-boot/2016-October/269729.html -try: - import importlib - have_importlib = True -except: - have_importlib = False - +import importlib import os import sys @@ -119,10 +110,7 @@ class Entry(object): old_path = sys.path sys.path.insert(0, os.path.join(our_path, 'etype')) try: - if have_importlib: - module = importlib.import_module(module_name) - else: - module = __import__(module_name) + module = importlib.import_module(module_name) except ImportError as e: raise ValueError("Unknown entry type '%s' in node '%s' (expected etype/%s.py, error '%s'" % (etype, node_path, module_name, e)) |