diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-05-11 11:15:26 -0600 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-05-11 11:15:36 -0600 |
| commit | 67a37e6d1f4fd5411e902ee5a59e2085d6c8a12d (patch) | |
| tree | a0cb764e4284f585feb29eb52199ca3ff432e885 /mitmproxy/script | |
| parent | 4c8e334642d98a5ed005b7cf6fc7e9cc379e6deb (diff) | |
| download | mitmproxy-67a37e6d1f4fd5411e902ee5a59e2085d6c8a12d.tar.gz mitmproxy-67a37e6d1f4fd5411e902ee5a59e2085d6c8a12d.tar.bz2 mitmproxy-67a37e6d1f4fd5411e902ee5a59e2085d6c8a12d.zip | |
improve script loading
Diffstat (limited to 'mitmproxy/script')
| -rw-r--r-- | mitmproxy/script/script.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mitmproxy/script/script.py b/mitmproxy/script/script.py index 4d0f73fa..484025b4 100644 --- a/mitmproxy/script/script.py +++ b/mitmproxy/script/script.py @@ -79,10 +79,10 @@ class Script(object): with open(self.filename) as f: code = compile(f.read(), self.filename, 'exec') exec (code, self.ns, self.ns) - except Exception as e: + except Exception: six.reraise( ScriptException, - ScriptException(str(e)), + ScriptException.from_exception_context(), sys.exc_info()[2] ) finally: @@ -113,10 +113,10 @@ class Script(object): if f: try: return f(self.ctx, *args, **kwargs) - except Exception as e: + except Exception: six.reraise( ScriptException, - ScriptException(str(e)), + ScriptException.from_exception_context(), sys.exc_info()[2] ) else: |