aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Altamirano <stephen@evilrobotstuff.com>2011-07-20 00:14:24 -0700
committerStephen Altamirano <stephen@evilrobotstuff.com>2011-07-20 00:14:24 -0700
commitaa7f8ac90b127901958fbfbe1b600c7e0c016611 (patch)
tree63dc46a9e734c1e54a70e8d2bb2620c59c1946dd
parentebfa9b2a5d6d0fa119059e833b4b3db8a3ea86b3 (diff)
downloadmitmproxy-aa7f8ac90b127901958fbfbe1b600c7e0c016611.tar.gz
mitmproxy-aa7f8ac90b127901958fbfbe1b600c7e0c016611.tar.bz2
mitmproxy-aa7f8ac90b127901958fbfbe1b600c7e0c016611.zip
Switches hotkeys. En/decode is now bound to 'z', kill connection now 'X'
-rw-r--r--libmproxy/console.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py
index 6d0dccab..c76f9314 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -190,7 +190,7 @@ class ConnectionItem(WWrap):
self.master.save_one_flow,
self.flow
)
- elif key == "z":
+ elif key == "X":
self.flow.kill(self.master)
elif key == "enter":
if self.flow.request:
@@ -531,7 +531,7 @@ class ConnectionView(WWrap):
self.master.view_next_flow(self.flow)
elif key == "|":
self.master.path_prompt("Script: ", self.state.last_script, self.run_script)
- elif key == "g":
+ elif key == "z":
if self.state.view_flow_mode == VIEW_FLOW_RESPONSE:
conn = self.flow.response
e = conn.headers["content-encoding"]
@@ -1313,7 +1313,7 @@ class ConsoleMaster(flow.FlowMaster):
keys = [
("C", "clear connection list"),
("d", "delete connection from view"),
- ("z", "kill and delete connection, even if it's mid-intercept"),
+ ("X", "kill and delete connection, even if it's mid-intercept"),
("space", "page down"),
]
text.extend(format_keyvals(keys, key="key", val="text", indent=4))
@@ -1322,9 +1322,9 @@ class ConsoleMaster(flow.FlowMaster):
keys = [
("b", "save request/response body"),
("e", "edit request/response"),
- ("g", "switch response encoding"),
("p", "previous flow"),
("v", "view body in external viewer"),
+ ("z", "switch response encoding"),
("|", "run script"),
("tab", "toggle response/request view"),
("space", "next flow"),