diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-11 12:13:39 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-11 12:13:39 +0200 |
| commit | 7c186a4edbb0c6bc1f471d0db62dfc60008160a2 (patch) | |
| tree | 89fb7e5b14cdfe9a0b61da828ddac8f355a3cdd0 /libmproxy/script.py | |
| parent | b62498e125191beca3b49841eb5f1fb9a93a868a (diff) | |
| parent | dd414e485212e3cab612a66d5d858c1a766ace04 (diff) | |
| download | mitmproxy-7c186a4edbb0c6bc1f471d0db62dfc60008160a2.tar.gz mitmproxy-7c186a4edbb0c6bc1f471d0db62dfc60008160a2.tar.bz2 mitmproxy-7c186a4edbb0c6bc1f471d0db62dfc60008160a2.zip | |
Merge branch 'master' into contentviews
Diffstat (limited to 'libmproxy/script.py')
| -rw-r--r-- | libmproxy/script.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/script.py b/libmproxy/script.py index e13f0e2b..b4ecfbbf 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -95,8 +95,8 @@ class Script: """ if self.ns is not None: self.unload() - ns = {} script_dir = os.path.dirname(os.path.abspath(self.args[0])) + ns = {'__file__': os.path.abspath(self.args[0])} sys.path.append(script_dir) try: execfile(self.args[0], ns, ns) @@ -179,7 +179,8 @@ def concurrent(fn): "error", "clientconnect", "serverconnect", - "clientdisconnect"): + "clientdisconnect", + "next_layer"): def _concurrent(ctx, obj): _handle_concurrent_reply(fn, obj, ctx, obj) |