aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-13 04:10:13 -1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-17 21:53:02 +0000
commite84c9aa77b61e48f1507edcba7bde65295f4d3ad (patch)
tree961b5d6c8ae411ce145e2a5612e753948e5fb175
parentc5969eedd035648e3258bade386cc67ce3bb0e03 (diff)
downloadbitbake-e84c9aa77b61e48f1507edcba7bde65295f4d3ad.tar.gz
utils: Update to use exec_module() instead of load_module()
This is deprecated in python 3.12 and Fedora 35 is throwing warnings so move to the new functions. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 68a18fbcb5959e334cf307d7fa8dc63832edb942) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/utils.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 5f5767c1d..fab16ffc5 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -16,7 +16,8 @@ import bb.msg
import multiprocessing
import fcntl
import importlib
-from importlib import machinery
+import importlib.machinery
+import importlib.util
import itertools
import subprocess
import glob
@@ -1584,7 +1585,9 @@ def load_plugins(logger, plugins, pluginpath):
logger.debug(1, 'Loading plugin %s' % name)
spec = importlib.machinery.PathFinder.find_spec(name, path=[pluginpath] )
if spec:
- return spec.loader.load_module()
+ mod = importlib.util.module_from_spec(spec)
+ spec.loader.exec_module(mod)
+ return mod
logger.debug(1, 'Loading plugins from %s...' % pluginpath)