aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'libmproxy/console/__init__.py')
-rw-r--r--libmproxy/console/__init__.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index b8d4a105..f68084ff 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -446,12 +446,14 @@ class ConsoleMaster(flow.FlowMaster):
if not path:
return
self.add_event("Running script on flow: %s"%path)
- ret = self.get_script(shlex.split(path, posix=(os.name != "nt")))
- if ret[0]:
+
+ try:
+ s = script.Script(shlex.split(path, posix=(os.name != "nt")), self)
+ except script.ScriptError, v:
self.statusbar.message("Error loading script.")
- self.add_event("Error loading script:\n%s"%ret[0])
+ self.add_event("Error loading script:\n%s"%v.args[0])
return
- s = ret[1]
+
if f.request:
self._run_script_method("request", s, f)
if f.response: