aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-13 22:45:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-13 23:18:40 +0000
commit3c2cb35588e91fbd7b136e5e2c78eeb77e126c84 (patch)
tree979ca9b49a1a5720b231232fe54b1b58d693efde
parentad79fadd855f5c10242ed17e9e0f3eb0274f26d2 (diff)
downloadbitbake-3c2cb35588e91fbd7b136e5e2c78eeb77e126c84.tar.gz
utils: Avoid warnings about deprecated imp module
The imp module is deprecated, port the code over to use importlib. bitbake/lib/bb/utils.py:30: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses import imp Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/utils.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 73b6cb423..461122bba 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -27,7 +27,8 @@ import bb
import bb.msg
import multiprocessing
import fcntl
-import imp
+import importlib
+from importlib import machinery
import itertools
import subprocess
import glob
@@ -43,7 +44,7 @@ from contextlib import contextmanager
from ctypes import cdll
logger = logging.getLogger("BitBake.Util")
-python_extensions = [e for e, _, _ in imp.get_suffixes()]
+python_extensions = importlib.machinery.all_suffixes()
def clean_context():
@@ -1544,12 +1545,9 @@ def export_proxies(d):
def load_plugins(logger, plugins, pluginpath):
def load_plugin(name):
logger.debug(1, 'Loading plugin %s' % name)
- fp, pathname, description = imp.find_module(name, [pluginpath])
- try:
- return imp.load_module(name, fp, pathname, description)
- finally:
- if fp:
- fp.close()
+ spec = importlib.machinery.PathFinder.find_spec(name, path=[pluginpath] )
+ if spec:
+ return spec.loader.load_module()
logger.debug(1, 'Loading plugins from %s...' % pluginpath)