diff options
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/__init__.py | 8 | ||||
| -rw-r--r-- | libmproxy/console/grideditor.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 3bc0c091..6f09a6b3 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -315,8 +315,8 @@ class ConsoleMaster(flow.FlowMaster): signals.add_event("Running script on flow: %s" % command, "debug") try: - s = script.Script(command, self) - except script.ScriptError as v: + s = script.Script(command, script.ScriptContext(self)) + except script.ScriptException as v: signals.status_message.send( message = "Error loading script." ) @@ -731,3 +731,7 @@ class ConsoleMaster(flow.FlowMaster): if f: self.process_flow(f) return f + + def script_change(self, script): + self.masterq.put(("script_change", script)) + signals.status_message.send(message="<{}> reloaded.".format(script.args[0])) diff --git a/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py index d32ce5b4..237eea28 100644 --- a/libmproxy/console/grideditor.py +++ b/libmproxy/console/grideditor.py @@ -636,7 +636,7 @@ class ScriptEditor(GridEditor): def is_error(self, col, val): try: script.Script.parse_command(val) - except script.ScriptError as v: + except script.ScriptException as v: return str(v) |