aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/__init__.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-02-08 22:28:15 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-02-08 22:28:15 +1300
commit866a93a8bc28fed47dde04f49c13592a7163bff4 (patch)
treec1620ebf1809a1cdce2771a2399c393d537e12ab /libmproxy/console/__init__.py
parente3f28e1c06093147660e2857adce24b441d6530f (diff)
downloadmitmproxy-866a93a8bc28fed47dde04f49c13592a7163bff4.tar.gz
mitmproxy-866a93a8bc28fed47dde04f49c13592a7163bff4.tar.bz2
mitmproxy-866a93a8bc28fed47dde04f49c13592a7163bff4.zip
Start consolidating keybindings.
I want each view to have a more coherent set of bindings. This means minimizing the global bindings, and making some bindings accessible only from screens related to their functionality.
Diffstat (limited to 'libmproxy/console/__init__.py')
-rw-r--r--libmproxy/console/__init__.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 196e71c7..69a50f18 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -372,11 +372,13 @@ class ConsoleMaster(flow.FlowMaster):
sys.exit(1)
def run_script_once(self, path, f):
+ if not path:
+ return
ret = self.get_script(path)
if ret[0]:
self.statusbar.message(ret[0])
+ return
s = ret[1]
-
if f.request:
s.run("request", f)
if f.response:
@@ -781,16 +783,6 @@ class ConsoleMaster(flow.FlowMaster):
self.set_intercept
)
self.sync_list_view()
- elif k == "m":
- self.prompt_onekey(
- "View",
- (
- ("raw", "r"),
- ("pretty", "p"),
- ("hex", "h"),
- ),
- self.changeview
- )
elif k == "Q":
raise Stop
elif k == "q":