diff options
| author | Aldo Cortesi <aldo@corte.si> | 2017-12-16 10:56:31 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2017-12-17 10:11:02 +1300 |
| commit | 2649e576910b4a90b6a50db3612f1a2b4c6d9f1a (patch) | |
| tree | 63c9cd76715175675c1b43d6bbaf421e8a1763d6 | |
| parent | cd913d598da421b4c4e264e029be5f13e3e009bb (diff) | |
| download | mitmproxy-2649e576910b4a90b6a50db3612f1a2b4c6d9f1a.tar.gz mitmproxy-2649e576910b4a90b6a50db3612f1a2b4c6d9f1a.tar.bz2 mitmproxy-2649e576910b4a90b6a50db3612f1a2b4c6d9f1a.zip | |
minor: fix key bindings, adjust flow command presentation
Fixes #2681
| -rw-r--r-- | mitmproxy/command.py | 2 | ||||
| -rw-r--r-- | mitmproxy/tools/console/defaultkeys.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/test_command.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/command.py b/mitmproxy/command.py index 7d7fa735..b3c8eb22 100644 --- a/mitmproxy/command.py +++ b/mitmproxy/command.py @@ -92,7 +92,7 @@ def typename(t: type, ret: bool) -> str: if isinstance(t, Choice): return "choice" elif t == typing.Sequence[flow.Flow]: - return "[flow]" if ret else "flowspec" + return "[flow]" elif t == typing.Sequence[str]: return "[str]" elif t == typing.Sequence[Cut]: diff --git a/mitmproxy/tools/console/defaultkeys.py b/mitmproxy/tools/console/defaultkeys.py index 7e078bbf..7920225b 100644 --- a/mitmproxy/tools/console/defaultkeys.py +++ b/mitmproxy/tools/console/defaultkeys.py @@ -157,7 +157,7 @@ def map(km): ) km.add("e", "console.grideditor.editor", ["grideditor"], "Edit in external editor") - km.add("z", "console.eventlog.clear", ["eventlog"], "Clear") + km.add("z", "eventstore.clear", ["eventlog"], "Clear") km.add( "a", diff --git a/test/mitmproxy/test_command.py b/test/mitmproxy/test_command.py index 066cbf15..47680c99 100644 --- a/test/mitmproxy/test_command.py +++ b/test/mitmproxy/test_command.py @@ -153,7 +153,7 @@ def test_simple(): def test_typename(): assert command.typename(str, True) == "str" assert command.typename(typing.Sequence[flow.Flow], True) == "[flow]" - assert command.typename(typing.Sequence[flow.Flow], False) == "flowspec" + assert command.typename(typing.Sequence[flow.Flow], False) == "[flow]" assert command.typename(command.Cuts, True) == "[cuts]" assert command.typename(typing.Sequence[command.Cut], False) == "[cut]" |