summaryrefslogtreecommitdiffstats
path: root/wrapper.py
diff options
context:
space:
mode:
authorDaniel Kutik <daniel.kutik@lavawerk.com>2022-11-25 13:32:05 +0100
committerDaniel Kutik <daniel.kutik@lavawerk.com>2022-11-28 15:06:59 +0000
commit50a2c0e368c09c34e9b40fb432a29402dd400fbe (patch)
tree9307dc2a41084f674d81e83c7fa3766d4ac94fcf /wrapper.py
parent35af2f8dafeb57e1a948ea8c168301bb16d2b5be (diff)
downloadgit-repo-50a2c0e368c09c34e9b40fb432a29402dd400fbe.tar.gz
wrapper.py: Replacing load_module() with exec_module()
Fixed "DeprecationWarning: the load_module() method is deprecated and slated for removal in Python 3.12; use exec_module() instead." in wrapper.py. Additionally removed Python 2 code (imp.load_source()). Test: tox Signed-off-by: Daniel Kutik <daniel.kutik@lavawerk.com> Change-Id: Ib7cc19b1c545f6449e034c4b01b582cf6cf4b581 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/353237 Reviewed-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'wrapper.py')
-rw-r--r--wrapper.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/wrapper.py b/wrapper.py
index b1aa4c50..65dcf3c6 100644
--- a/wrapper.py
+++ b/wrapper.py
@@ -12,12 +12,8 @@
12# See the License for the specific language governing permissions and 12# See the License for the specific language governing permissions and
13# limitations under the License. 13# limitations under the License.
14 14
15try: 15import importlib.machinery
16 from importlib.machinery import SourceFileLoader 16import importlib.util
17 _loader = lambda *args: SourceFileLoader(*args).load_module()
18except ImportError:
19 import imp
20 _loader = lambda *args: imp.load_source(*args)
21import os 17import os
22 18
23 19
@@ -31,5 +27,9 @@ _wrapper_module = None
31def Wrapper(): 27def Wrapper():
32 global _wrapper_module 28 global _wrapper_module
33 if not _wrapper_module: 29 if not _wrapper_module:
34 _wrapper_module = _loader('wrapper', WrapperPath()) 30 modname = 'wrapper'
31 loader = importlib.machinery.SourceFileLoader(modname, WrapperPath())
32 spec = importlib.util.spec_from_loader(modname, loader)
33 _wrapper_module = importlib.util.module_from_spec(spec)
34 loader.exec_module(_wrapper_module)
35 return _wrapper_module 35 return _wrapper_module