aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2012-12-05 14:32:14 -0800
committerAldo Cortesi <aldo@corte.si>2012-12-05 14:32:14 -0800
commit9f0db83c486bcf5f6653b4e4164baba27960e1d0 (patch)
tree48dc02aacf68988d978267d08fa3ee66968b5531
parent09c29e894e989639a44a00009dae3b8bfc738a84 (diff)
parent505da188ebe9ac25128dfa5aa5c8b4b0fa05b68f (diff)
downloadmitmproxy-9f0db83c486bcf5f6653b4e4164baba27960e1d0.tar.gz
mitmproxy-9f0db83c486bcf5f6653b4e4164baba27960e1d0.tar.bz2
mitmproxy-9f0db83c486bcf5f6653b4e4164baba27960e1d0.zip
Merge pull request #74 from kanzure/editexception
Show an error when $EDITOR/$PAGER are unset.
-rw-r--r--libmproxy/console/flowview.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 1d1d1e7b..3473c474 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -542,7 +542,10 @@ class FlowView(common.WWrap):
if conn and conn.content:
t = conn.headers["content-type"] or [None]
t = t[0]
- self.master.spawn_external_viewer(conn.content, t)
+ if os.environ.has_key("EDITOR") or os.environ.has_key("PAGER"):
+ self.master.spawn_external_viewer(conn.content, t)
+ else:
+ self.master.statusbar.message("Error! Set $EDITOR or $PAGER.")
elif key == "|":
self.master.path_prompt(
"Send flow to script: ", self.state.last_script,