aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-02-18 12:40:45 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-02-18 12:40:45 +1300
commitcd4eea39348fc9d59d4f0cc3f71384f7c1c2b2e2 (patch)
treeae09d5a06c1d7f2ae6314fd5f96d6b506f454507 /libmproxy/console.py
parent7769e5a898150451a52b5683c519ee04802310b8 (diff)
downloadmitmproxy-cd4eea39348fc9d59d4f0cc3f71384f7c1c2b2e2.tar.gz
mitmproxy-cd4eea39348fc9d59d4f0cc3f71384f7c1c2b2e2.tar.bz2
mitmproxy-cd4eea39348fc9d59d4f0cc3f71384f7c1c2b2e2.zip
First pass of script hooks for mitmdump.
Also stub out docs, improve mitmdump error handling.
Diffstat (limited to 'libmproxy/console.py')
-rw-r--r--libmproxy/console.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py
index c14f1aef..895974d2 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -549,7 +549,7 @@ class ConnectionView(WWrap):
path = os.path.expanduser(path)
self.state.last_script = path
try:
- newflow, serr = self.flow.run_script(path)
+ serr = self.flow.run_script(path)
except flow.RunException, e:
if e.errout:
serr = "Script error code: %s\n\n"%e.returncode + e.errout
@@ -559,7 +559,6 @@ class ConnectionView(WWrap):
if serr:
serr = "Script output:\n\n" + serr
self.master.spawn_external_viewer(serr, None)
- self.flow.load_state(newflow.get_state())
self.master.refresh_connection(self.flow)