Merge pull request #935 from mitmproxy/coding-style

Improve Coding Style

libmproxy/console/__init__.py

@@ -707,7 +707,7 @@ class ConsoleMaster(flow.FlowMaster):
                 self.state.intercept) and not f.request.is_replay:
             f.intercept(self)
         else:
-            #check if flow was intercepted within an inline script by flow.intercept()
+            # check if flow was intercepted within an inline script by flow.intercept()
             if f.intercepted:
                 f.intercept(self)
             else:

libmproxy/models/http.py

@@ -13,7 +13,6 @@ from .. import version
 from .flow import Flow
 
 
-
 class MessageMixin(object):
 
     def get_decoded_content(self):

libmproxy/protocol/http.py

@@ -242,7 +242,6 @@ class HttpLayer(Layer):
             self.send_response(response)
         except (NetlibException, H2Error):
             self.log(traceback.format_exc(), "debug")
-            pass
 
     def change_upstream_proxy_server(self, address):
         # Make set_upstream_proxy_server always available,

libmproxy/protocol/http1.py

@@ -1,12 +1,9 @@
 from __future__ import (absolute_import, print_function, division)
 
-import six
 
-from netlib import tcp
 from netlib.http import http1
 
 from .http import _HttpTransmissionLayer, HttpLayer
-from .. import utils
 from ..models import HTTPRequest, HTTPResponse
 
 

libmproxy/protocol/http2.py

@@ -18,8 +18,6 @@ from .base import Layer
 from .http import _HttpTransmissionLayer, HttpLayer
 from .. import utils
 from ..models import HTTPRequest, HTTPResponse
-from ..exceptions import HttpProtocolException
-from ..exceptions import ProtocolException
 
 
 class SafeH2Connection(H2Connection):
@@ -234,7 +232,6 @@ class Http2Layer(Layer):
                             stream.zombie = time.time()
                         return
 
-
                     frame, _ = hyperframe.frame.Frame.parse_frame_header(raw_frame[:9])
 
                     if is_server:

libmproxy/protocol/tls.py

@@ -419,7 +419,7 @@ class TlsLayer(Layer):
         try:
             self.ctx.connect()
             self._establish_tls_with_server()
-        except Exception as e:
+        except Exception:
             try:
                 self._establish_tls_with_client()
             except:

libmproxy/stateobject.py

@@ -3,6 +3,7 @@ from netlib.utils import Serializable
 
 
 class StateObject(Serializable):
+
     """
     An object with serializable state.
 

libmproxy/web/app.py

@@ -42,6 +42,7 @@ class APIError(tornado.web.HTTPError):
 
 
 class BasicAuth(object):
+
     def set_auth_headers(self):
         self.set_status(401)
         self.set_header('WWW-Authenticate', 'Basic realm=MITMWeb')

test/test_console_help.py

@@ -6,21 +6,6 @@ if os.name == "nt":
 import libmproxy.console.help as help
 
 
-class DummyLoop:
-
-    def __init__(self):
-        self.widget = None
-
-
-class DummyMaster:
-
-    def __init__(self):
-        self.loop = DummyLoop()
-
-    def make_view(self):
-        pass
-
-
 class TestHelp:
 
     def test_helptext(self):
@@ -28,7 +13,6 @@ class TestHelp:
         assert h.helptext()
 
     def test_keypress(self):
-        master = DummyMaster()
         h = help.HelpView([1, 2, 3])
         assert not h.keypress((0, 0), "q")
         assert not h.keypress((0, 0), "?")

test/test_filt.py

@@ -209,7 +209,6 @@ class TestMatching:
 
     def test_method(self):
         q = self.req()
-        s = self.resp()
         assert self.q("~m get", q)
         assert not self.q("~m post", q)
 
@@ -218,7 +217,6 @@ class TestMatching:
 
     def test_domain(self):
         q = self.req()
-        s = self.resp()
         assert self.q("~d host", q)
         assert not self.q("~d none", q)
 

test/test_flow.py

@@ -350,7 +350,7 @@ class TestFlow(object):
 
     def test_copy(self):
         f = tutils.tflow(resp=True)
-        a0 = f.get_state()
+        f.get_state()
         f2 = f.copy()
         a = f.get_state()
         b = f2.get_state()
@@ -532,7 +532,6 @@ class TestState:
         assert c.flow_count() == 2
         assert c.active_flow_count() == 1
 
-        _ = HTTPResponse.wrap(netlib.tutils.tresp())
         assert not c.update_flow(None)
         assert c.active_flow_count() == 1
 

test/test_protocol_http1.py

@@ -1,7 +1,6 @@
-from netlib.exceptions import HttpSyntaxException
 from netlib.http import http1
 from netlib.tcp import TCPClient
-from netlib.tutils import treq, raises
+from netlib.tutils import treq
 from . import tutils, tservers
 
 

test/test_protocol_http2.py

@@ -5,10 +5,8 @@ import pytest
 import traceback
 import os
 import tempfile
-import sys
 
 from libmproxy.proxy.config import ProxyConfig
-from libmproxy.proxy.server import ProxyServer
 from libmproxy.cmdline import APP_HOST, APP_PORT
 
 import logging
@@ -24,9 +22,7 @@ from netlib import tservers as netlib_tservers
 from netlib.utils import http2_read_raw_frame
 
 import h2
-from hyperframe.frame import Frame
 
-from libmproxy import utils
 from . import tservers
 
 requires_alpn = pytest.mark.skipif(