Cosmetics

CHANGELOG.rst

@@ -15,11 +15,11 @@ Added
 - A new ``--tail`` option to regenerate the report on every new exchange,
   so you can inspect traffic as it comes (see `docs`_).
 
-- HTTPolice now writes brief summaries to mitmproxy’s eventlog, like this::
+- HTTPolice now writes brief summaries to mitmproxy’s event log, like this::
 
     HTTPolice found 1 errors, 2 comments in: GET /api/v1/ - 200 OK
 
-  (The eventlog is printed to the console when you use ``mitmdump``,
+  (The event log is printed to the console when you use ``mitmdump``,
   or to the “Event log” pane when you press the ‘e’ key in ``mitmproxy``.)
 
 - In the ``mitmproxy`` console UI, you can now see a brief report

doc/index.rst

@@ -101,7 +101,7 @@ on its “Detail” tab:
 __ http://docs.mitmproxy.org/en/stable/mitmproxy.html
 
 How do you even know that there’s anything to see there?
-Currently the only way is to follow the eventlog,
+Currently the only way is to follow the event log,
 which you can trigger by pressing the ‘e’ key:
 
 .. image:: mitmproxy-eventlog.png

mitmproxy_httpolice.py

@@ -5,8 +5,8 @@
 import io
 import os
 
-import mitmproxy.ctx
 import httpolice
+import mitmproxy.ctx
 
 
 __version__ = '0.6.0.dev1'
@@ -30,7 +30,7 @@ def start(argv=None):
                               args.silence)
 
 
-class MitmproxyHTTPolice(object):
+class MitmproxyHTTPolice:
 
     def __init__(self, report_file, tail, output_format, silence):
         self.report_file = report_file
@@ -75,14 +75,14 @@ def construct_request(flow):
     # are simply rejected as errors by mitmproxy, closing the connection.
     target = decode(flow.request.path)
 
-    if version == u'HTTP/2':
+    if version == 'HTTP/2':
         pseudo_headers = httpolice.helpers.pop_pseudo_headers(headers)
-        authority = pseudo_headers.get(u':authority')
-        has_host = any(k.lower() == u'host' for (k, v) in headers)
-        if authority and not has_host and target.startswith(u'/'):
+        authority = pseudo_headers.get(':authority')
+        has_host = any(k.lower() == 'host' for (k, v) in headers)
+        if authority and not has_host and target.startswith('/'):
             # Reconstruct HTTP/2's equivalent of
             # the "absolute form" of request target (RFC 7540 Section 8.1.2.3).
-            target = scheme + u'://' + decode(authority) + target
+            target = scheme + '://' + decode(authority) + target
 
     return httpolice.Request(scheme, method, target, version, headers, body)
 
@@ -91,15 +91,15 @@ def construct_response(flow):
     version, headers, body = extract_message_basics(flow.response)
     status = flow.response.status_code
     reason = decode(flow.response.reason)
-    if version == u'HTTP/2':
+    if version == 'HTTP/2':
         httpolice.helpers.pop_pseudo_headers(headers)
     return httpolice.Response(version, status, reason, headers, body)
 
 
 def extract_message_basics(msg):
     version = decode(msg.http_version)
-    if version == u'HTTP/2.0':
-        version = u'HTTP/2'
+    if version == 'HTTP/2.0':
+        version = 'HTTP/2'
     headers = [(decode(k), v) for (k, v) in msg.headers.fields]
     body = msg.raw_content
     return version, headers, body
@@ -149,7 +149,7 @@ def decode(s):
 
 def ellipsize(s, max_length=40):
     if len(s) > max_length:
-        ellipsis = u'...'
+        ellipsis = '...'
         return s[:(max_length - len(ellipsis))] + ellipsis
     else:
         return s
@@ -160,6 +160,8 @@ class ReprString(str):
     # Currently mitmproxy displays ``repr()`` in details view, not ``str()``.
     # See also https://discourse.mitmproxy.org/t/extending-the-ui/359/5
 
+    __slots__ = []
+
     def __repr__(self):
         return str(self)
 

requirements.in

@@ -1,2 +1,2 @@
 mitmproxy >= 2.0.0
-HTTPolice >= 0.5.0.dev1
+HTTPolice >= 0.5.0

test_fake_mitmdump.py

@@ -89,7 +89,7 @@ def test_complex(bench):               # pylint: disable=redefined-outer-name
             ),
             tutils.tresp(
                 http_version='HTTP/1.1',
-                status_code=201, reason=u'Très bien'.encode('iso-8859-1'),
+                status_code=201, reason='Très bien'.encode('iso-8859-1'),
                 headers=Headers([(b'Content-Type', b'text/plain'),
                                  (b'Content-Length', b'14'),
                                  (b'Date', b'Tue, 03 May 2016 14:13:34 GMT')]),

test_real_mitmdump.py

@@ -17,7 +17,7 @@
 import pytest
 
 
-class RealMitmdump(object):
+class RealMitmdump:
 
     # pylint: disable=attribute-defined-outside-init
 
@@ -55,9 +55,9 @@ def send_tunneled_request(self, host, port, data):
         # We need our own TLS context that does not verify certificates.
         context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
         sock = socket.create_connection((self.host, self.port))
-        connect = (u'CONNECT {0}:{1} HTTP/1.1\r\n'
-                   u'Host: {0}\r\n'
-                   u'\r\n'.format(host, port))
+        connect = ('CONNECT {0}:{1} HTTP/1.1\r\n'
+                   'Host: {0}\r\n'
+                   '\r\n'.format(host, port))
         sock.sendall(connect.encode('iso-8859-1'))
         assert sock.recv(4096).startswith(b'HTTP/1.1 2')
         sock = context.wrap_socket(sock, server_hostname=host)