diff options
| author | Aldo Cortesi <aldo@corte.si> | 2013-04-19 17:17:32 -0700 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2013-04-19 17:17:32 -0700 |
| commit | 7bd3e1d2a46d748ee1a6fa8a584c483f99996973 (patch) | |
| tree | 75abfa28f537d80174e87f94c9ec15ea7c53a8db | |
| parent | 51b775cfd4165ed80dcb5458ddff942125fcba31 (diff) | |
| parent | 3d7f31b23da599023f2315f68026fa99889ed9a0 (diff) | |
| download | mitmproxy-7bd3e1d2a46d748ee1a6fa8a584c483f99996973.tar.gz mitmproxy-7bd3e1d2a46d748ee1a6fa8a584c483f99996973.tar.bz2 mitmproxy-7bd3e1d2a46d748ee1a6fa8a584c483f99996973.zip | |
Merge pull request #116 from afh/pull/highlight_key_help
Correct display mode highlight keys
| -rw-r--r-- | libmproxy/console/contentview.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 6 | ||||
| -rw-r--r-- | libmproxy/console/help.py | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 2b46064a..06710d2c 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -137,7 +137,7 @@ class ViewXML: class ViewJSON: name = "JSON" - prompt = ("json", "j") + prompt = ("json", "s") content_types = ["application/json"] def __call__(self, hdrs, content, limit): lines = utils.pretty_json(content) diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 5f1d261f..8932b912 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -34,10 +34,14 @@ def _mkhelp(): [("text", ": automatic detection")] ), (None, - common.highlight_key("hex", "h") + + common.highlight_key("hex", "e") + [("text", ": Hex")] ), (None, + common.highlight_key("html", "h") + + [("text", ": HTML")] + ), + (None, common.highlight_key("image", "i") + [("text", ": Image")] ), diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py index 40f81955..de373083 100644 --- a/libmproxy/console/help.py +++ b/libmproxy/console/help.py @@ -57,10 +57,14 @@ class HelpView(urwid.ListBox): [("text", ": automatic detection")] ), (None, - common.highlight_key("hex", "h") + + common.highlight_key("hex", "e") + [("text", ": Hex")] ), (None, + common.highlight_key("html", "h") + + [("text", ": HTML")] + ), + (None, common.highlight_key("image", "i") + [("text", ": Image")] ), |