diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-12 13:59:32 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-12 13:59:32 +1300 |
| commit | e5776b8be3ea36c065beabe416506871f34892e6 (patch) | |
| tree | 46da3faa0648588ac60d66b0430f06b06be7fc78 /libmproxy/console | |
| parent | 58e1b3a47f392a5f4f16e30318820f163568f54e (diff) | |
| download | mitmproxy-e5776b8be3ea36c065beabe416506871f34892e6.tar.gz mitmproxy-e5776b8be3ea36c065beabe416506871f34892e6.tar.bz2 mitmproxy-e5776b8be3ea36c065beabe416506871f34892e6.zip | |
Clean up and clarify script API
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/__init__.py | 10 |
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: |