aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-07-20 15:23:22 +0200
committerMaximilian Hils <git@maximilianhils.com>2017-07-20 15:23:22 +0200
commit94d28831e1bc3d8d4ddcdf858a40921913b75406 (patch)
treeafa724e2ec441f80432240016f6d1522616915fb
parent779677bcc6177c71891cd7847929a3aa4774c857 (diff)
downloadmitmproxy-94d28831e1bc3d8d4ddcdf858a40921913b75406.tar.gz
mitmproxy-94d28831e1bc3d8d4ddcdf858a40921913b75406.tar.bz2
mitmproxy-94d28831e1bc3d8d4ddcdf858a40921913b75406.zip
replace deprecated use of SourceFileLoader.load_module
-rw-r--r--mitmproxy/addons/script.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mitmproxy/addons/script.py b/mitmproxy/addons/script.py
index 30fa740b..3e60fe67 100644
--- a/mitmproxy/addons/script.py
+++ b/mitmproxy/addons/script.py
@@ -24,12 +24,14 @@ def load_script(actx, path):
# the fullname is not unique among scripts, so if there already is an existing script with said
# fullname, remove it.
sys.modules.pop(fullname, None)
- loader = importlib.machinery.SourceFileLoader(fullname, path)
try:
oldpath = sys.path
sys.path.insert(0, os.path.dirname(path))
with addonmanager.safecall():
- m = loader.load_module()
+ loader = importlib.machinery.SourceFileLoader(fullname, path)
+ spec = importlib.util.spec_from_loader(fullname, loader=loader)
+ m = importlib.util.module_from_spec(spec)
+ loader.exec_module(m)
if not getattr(m, "name", None):
m.name = path
return m