aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/help.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-05-07 16:45:15 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-05-07 16:45:15 +0200
commit3f440aad593036f5bad8c12128502184e333ccc9 (patch)
tree50b98038d13a3f2c9cf65a48af0b6e9bac4111ad /libmproxy/console/help.py
parent4f1fe11549f47531f1c6d618fa20f6c1020653ed (diff)
parent0ecd0ba3abd524fb39b2a87e553abcdba5f2dde4 (diff)
downloadmitmproxy-3f440aad593036f5bad8c12128502184e333ccc9.tar.gz
mitmproxy-3f440aad593036f5bad8c12128502184e333ccc9.tar.bz2
mitmproxy-3f440aad593036f5bad8c12128502184e333ccc9.zip
Merge pull request #271 from davidpshaw/master
- working WBXML parser
Diffstat (limited to 'libmproxy/console/help.py')
-rw-r--r--libmproxy/console/help.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py
index bd7217e1..3fd216b5 100644
--- a/libmproxy/console/help.py
+++ b/libmproxy/console/help.py
@@ -79,6 +79,10 @@ class HelpView(urwid.ListBox):
[("text", ": XML")]
),
(None,
+ common.highlight_key("wbxml", "w") +
+ [("text", ": WBXML")]
+ ),
+ (None,
common.highlight_key("amf", "f") +
[("text", ": AMF (requires PyAMF)")]
),