aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/flowview.py
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-12-22 18:26:15 -0600
committerBryan Bishop <kanzure@gmail.com>2012-12-22 18:26:15 -0600
commit4d250095cba36b32ce3e5083d453525209eeee06 (patch)
treefe0fe6dffb5d56a9407d98bc375c663a0817b784 /libmproxy/console/flowview.py
parent0451eb193ef0abaf875bfd8ad2a1ac4bd68c3efe (diff)
downloadmitmproxy-4d250095cba36b32ce3e5083d453525209eeee06.tar.gz
mitmproxy-4d250095cba36b32ce3e5083d453525209eeee06.tar.bz2
mitmproxy-4d250095cba36b32ce3e5083d453525209eeee06.zip
fix external viewer using shlex
This makes spawn_external_viewer not crash when $EDITOR or $PAGER have spaces or multiple arguments. In addition, spawn_external_viewer now chmods the file to read-only to remind users who use only an $EDITOR that this function does not read the file when the user returns. Also, some of the redundant exception case handling for editing has been consolidated. fixes #79
Diffstat (limited to 'libmproxy/console/flowview.py')
-rw-r--r--libmproxy/console/flowview.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 3473c474..4215f170 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -343,7 +343,7 @@ class FlowView(common.WWrap):
self.flow.backup()
if part == "r":
c = self.master.spawn_editor(conn.content or "")
- conn.content = c.rstrip("\n")
+ conn.content = c.rstrip("\n") # what?
elif part == "f":
if not conn.get_form_urlencoded() and conn.content:
self.master.prompt_onekey(