aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-02-02 11:44:28 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-02-02 11:44:28 +1300
commitdb99da6af560f80bc169979f6d8681de3879acf2 (patch)
tree14da7a5b00704814376dc29b2489bf85f29fe48d /libmproxy/console.py
parent8d37ff81e6e256180fdb8e266df4f861e8593c82 (diff)
downloadmitmproxy-db99da6af560f80bc169979f6d8681de3879acf2.tar.gz
mitmproxy-db99da6af560f80bc169979f6d8681de3879acf2.tar.bz2
mitmproxy-db99da6af560f80bc169979f6d8681de3879acf2.zip
Improve script handling.
- Display output in external viewer when script exits with error. - Add a "changed" indicator to show if a request can be reverted.
Diffstat (limited to 'libmproxy/console.py')
-rw-r--r--libmproxy/console.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py
index 5ed67244..0df1339c 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -61,8 +61,11 @@ def format_flow(f, focus, padding=3):
]
if f.response or f.error or f.is_replay():
txt.append("\n" + " "*(padding+2))
+ met = ""
if f.is_replay():
txt.append(("method", "[replay] "))
+ elif f.modified():
+ txt.append(("method", "[edited] "))
if not (f.response or f.error):
txt.append(("text", "waiting for response..."))
@@ -504,6 +507,9 @@ class ConnectionView(WWrap):
try:
newflow, serr = self.flow.run_script(path)
except flow.RunException, e:
+ if e.errout:
+ serr = "Script error code: %s\n\n"%e.returncode + e.errout
+ self.master.spawn_external_viewer(serr, None)
self.master.statusbar.message("Script error: %s"%e)
return
if serr: