Merge pull request #2759 from mhils/issue-1833

Fix #1833, clean up common.format_keyvals

1 files changed, 48 insertions, 48 deletions

diff --git a/mitmproxy/tools/console/flowdetailview.py b/mitmproxy/tools/console/flowdetailview.py
index 28fe1fbc..32ac4b60 100644
--- a/mitmproxy/tools/console/flowdetailview.py
+++ b/mitmproxy/tools/console/flowdetailview.py
@@ -23,157 +23,157 @@ def flowdetails(state, flow: http.HTTPFlow):
     metadata = flow.metadata
 
     if metadata is not None and len(metadata) > 0:
-        parts = [[str(k), repr(v)] for k, v in metadata.items()]
+        parts = [(str(k), repr(v)) for k, v in metadata.items()]
         text.append(urwid.Text([("head", "Metadata:")]))
-        text.extend(common.format_keyvals(parts, key="key", val="text", indent=4))
+        text.extend(common.format_keyvals(parts, indent=4))
 
     if sc is not None and sc.ip_address:
         text.append(urwid.Text([("head", "Server Connection:")]))
         parts = [
-            ["Address", human.format_address(sc.address)],
+            ("Address", human.format_address(sc.address)),
         ]
         if sc.ip_address:
-            parts.append(["Resolved Address", human.format_address(sc.ip_address)])
+            parts.append(("Resolved Address", human.format_address(sc.ip_address)))
         if resp:
-            parts.append(["HTTP Version", resp.http_version])
+            parts.append(("HTTP Version", resp.http_version))
         if sc.alpn_proto_negotiated:
-            parts.append(["ALPN", sc.alpn_proto_negotiated])
+            parts.append(("ALPN", sc.alpn_proto_negotiated))
 
         text.extend(
-            common.format_keyvals(parts, key="key", val="text", indent=4)
+            common.format_keyvals(parts, indent=4)
         )
 
         c = sc.cert
         if c:
             text.append(urwid.Text([("head", "Server Certificate:")]))
             parts = [
-                ["Type", "%s, %s bits" % c.keyinfo],
-                ["SHA1 digest", c.digest("sha1")],
-                ["Valid to", str(c.notafter)],
-                ["Valid from", str(c.notbefore)],
-                ["Serial", str(c.serial)],
-                [
+                ("Type", "%s, %s bits" % c.keyinfo),
+                ("SHA1 digest", c.digest("sha1")),
+                ("Valid to", str(c.notafter)),
+                ("Valid from", str(c.notbefore)),
+                ("Serial", str(c.serial)),
+                (
                     "Subject",
                     urwid.BoxAdapter(
                         urwid.ListBox(
                             common.format_keyvals(
                                 c.subject,
-                                key="highlight",
-                                val="text"
+                                key_format="highlight"
                             )
                         ),
                         len(c.subject)
                     )
-                ],
-                [
+                ),
+                (
                     "Issuer",
                     urwid.BoxAdapter(
                         urwid.ListBox(
                             common.format_keyvals(
-                                c.issuer, key="highlight", val="text"
+                                c.issuer,
+                                key_format="highlight"
                             )
                         ),
                         len(c.issuer)
                     )
-                ]
+                )
             ]
 
             if c.altnames:
                 parts.append(
-                    [
+                    (
                         "Alt names",
                         ", ".join(strutils.bytes_to_escaped_str(x) for x in c.altnames)
-                    ]
+                    )
                 )
             text.extend(
-                common.format_keyvals(parts, key="key", val="text", indent=4)
+                common.format_keyvals(parts, indent=4)
             )
 
     if cc is not None:
         text.append(urwid.Text([("head", "Client Connection:")]))
 
         parts = [
-            ["Address", "{}:{}".format(cc.address[0], cc.address[1])],
+            ("Address", "{}:{}".format(cc.address[0], cc.address[1])),
         ]
         if req:
-            parts.append(["HTTP Version", req.http_version])
+            parts.append(("HTTP Version", req.http_version))
         if cc.tls_version:
-            parts.append(["TLS Version", cc.tls_version])
+            parts.append(("TLS Version", cc.tls_version))
         if cc.sni:
-            parts.append(["Server Name Indication", cc.sni])
+            parts.append(("Server Name Indication", cc.sni))
         if cc.cipher_name:
-            parts.append(["Cipher Name", cc.cipher_name])
+            parts.append(("Cipher Name", cc.cipher_name))
         if cc.alpn_proto_negotiated:
-            parts.append(["ALPN", cc.alpn_proto_negotiated])
+            parts.append(("ALPN", cc.alpn_proto_negotiated))
 
         text.extend(
-            common.format_keyvals(parts, key="key", val="text", indent=4)
+            common.format_keyvals(parts, indent=4)
         )
 
     parts = []
 
     if cc is not None and cc.timestamp_start:
         parts.append(
-            [
+            (
                 "Client conn. established",
                 maybe_timestamp(cc, "timestamp_start")
-            ]
+            )
         )
         if cc.ssl_established:
             parts.append(
-                [
+                (
                     "Client conn. TLS handshake",
                     maybe_timestamp(cc, "timestamp_ssl_setup")
-                ]
+                )
             )
 
     if sc is not None and sc.timestamp_start:
         parts.append(
-            [
+            (
                 "Server conn. initiated",
                 maybe_timestamp(sc, "timestamp_start")
-            ]
+            )
         )
         parts.append(
-            [
+            (
                 "Server conn. TCP handshake",
                 maybe_timestamp(sc, "timestamp_tcp_setup")
-            ]
+            )
         )
         if sc.ssl_established:
             parts.append(
-                [
+                (
                     "Server conn. TLS handshake",
                     maybe_timestamp(sc, "timestamp_ssl_setup")
-                ]
+                )
             )
 
     if req is not None and req.timestamp_start:
         parts.append(
-            [
+            (
                 "First request byte",
                 maybe_timestamp(req, "timestamp_start")
-            ]
+            )
         )
         parts.append(
-            [
+            (
                 "Request complete",
                 maybe_timestamp(req, "timestamp_end")
-            ]
+            )
         )
 
     if resp is not None and resp.timestamp_start:
         parts.append(
-            [
+            (
                 "First response byte",
                 maybe_timestamp(resp, "timestamp_start")
-            ]
+            )
         )
         parts.append(
-            [
+            (
                 "Response complete",
                 maybe_timestamp(resp, "timestamp_end")
-            ]
+            )
         )
 
     if parts:
@@ -181,6 +181,6 @@ def flowdetails(state, flow: http.HTTPFlow):
         parts = sorted(parts, key=lambda p: p[1])
 
         text.append(urwid.Text([("head", "Timing:")]))
-        text.extend(common.format_keyvals(parts, key="key", val="text", indent=4))
+        text.extend(common.format_keyvals(parts, indent=4))
 
     return searchable.Searchable(text)