aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-01-05 16:05:14 +0100
committerMaximilian Hils <git@maximilianhils.com>2018-01-05 16:45:46 +0100
commit9b03ab59ef2f3c3f40b0db0d204b00d819fcc5f5 (patch)
treec3a011c271ef70196921877e0e143f691b92d649
parentc2adcb58f4f5f221d10599db2c97e6cf828157c1 (diff)
downloadmitmproxy-9b03ab59ef2f3c3f40b0db0d204b00d819fcc5f5.tar.gz
mitmproxy-9b03ab59ef2f3c3f40b0db0d204b00d819fcc5f5.tar.bz2
mitmproxy-9b03ab59ef2f3c3f40b0db0d204b00d819fcc5f5.zip
minor fixes
-rw-r--r--mitmproxy/contentviews/base.py4
-rw-r--r--mitmproxy/tools/console/common.py32
-rw-r--r--mitmproxy/tools/console/defaultkeys.py2
3 files changed, 18 insertions, 20 deletions
diff --git a/mitmproxy/contentviews/base.py b/mitmproxy/contentviews/base.py
index 97740eea..bdab1e99 100644
--- a/mitmproxy/contentviews/base.py
+++ b/mitmproxy/contentviews/base.py
@@ -43,9 +43,11 @@ def format_dict(
) -> typing.Iterator[TViewLine]:
"""
Helper function that transforms the given dictionary into a list of
+ [
("key", key )
("value", value)
- tuples, where key is padded to a uniform width.
+ ]
+ entries, where key is padded to a uniform width.
"""
max_key_len = max(len(k) for k in d.keys())
max_key_len = min(max_key_len, KEY_MAX)
diff --git a/mitmproxy/tools/console/common.py b/mitmproxy/tools/console/common.py
index 47a30272..1ef1b751 100644
--- a/mitmproxy/tools/console/common.py
+++ b/mitmproxy/tools/console/common.py
@@ -205,19 +205,15 @@ def format_flow(f, focus, extended=False, hostheader=False, max_url_len=False):
focus=focus,
extended=extended,
max_url_len=max_url_len,
-
- intercepted = f.intercepted,
- acked = acked,
-
- req_timestamp = f.request.timestamp_start,
- req_is_replay = f.request.is_replay,
- req_method = f.request.method,
- req_url = f.request.pretty_url if hostheader else f.request.url,
- req_http_version = f.request.http_version,
-
- err_msg = f.error.msg if f.error else None,
-
- marked = f.marked,
+ intercepted=f.intercepted,
+ acked=acked,
+ req_timestamp=f.request.timestamp_start,
+ req_is_replay=f.request.is_replay,
+ req_method=f.request.method,
+ req_url=f.request.pretty_url if hostheader else f.request.url,
+ req_http_version=f.request.http_version,
+ err_msg=f.error.msg if f.error else None,
+ marked=f.marked,
)
if f.response:
if f.response.raw_content:
@@ -232,11 +228,11 @@ def format_flow(f, focus, extended=False, hostheader=False, max_url_len=False):
roundtrip = human.pretty_duration(duration)
d.update(dict(
- resp_code = f.response.status_code,
- resp_reason = f.response.reason,
- resp_is_replay = f.response.is_replay,
- resp_clen = contentdesc,
- roundtrip = roundtrip,
+ resp_code=f.response.status_code,
+ resp_reason=f.response.reason,
+ resp_is_replay=f.response.is_replay,
+ resp_clen=contentdesc,
+ roundtrip=roundtrip,
))
t = f.response.headers.get("content-type")
diff --git a/mitmproxy/tools/console/defaultkeys.py b/mitmproxy/tools/console/defaultkeys.py
index f8a3df2d..50941f55 100644
--- a/mitmproxy/tools/console/defaultkeys.py
+++ b/mitmproxy/tools/console/defaultkeys.py
@@ -59,7 +59,7 @@ def map(km):
km.add("M", "view.marked.toggle", ["flowlist"], "Toggle viewing marked flows")
km.add(
"n",
- "console.command view.create get https://google.com",
+ "console.command view.create get https://example.com/",
["flowlist"],
"Create a new flow"
)