Merge branch 'master' of https://github.com/mitmproxy/mitmproxy

8 files changed, 10 insertions, 10 deletions

diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index ad3f4306..e739ec61 100644
--- a/libmproxy/console/__init__.py
+++ b/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:
diff --git a/libmproxy/models/http.py b/libmproxy/models/http.py
index a2a345d7..3c22e4c9 100644
--- a/libmproxy/models/http.py
+++ b/libmproxy/models/http.py
@@ -13,7 +13,6 @@ from .. import version
 from .flow import Flow
 
 
-
 class MessageMixin(object):
 
     def get_decoded_content(self):
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 4a86f9da..13d7903b 100644
--- a/libmproxy/protocol/http.py
+++ b/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,
diff --git a/libmproxy/protocol/http1.py b/libmproxy/protocol/http1.py
index fc2cf07a..a4cd8801 100644
--- a/libmproxy/protocol/http1.py
+++ b/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
 
 
diff --git a/libmproxy/protocol/http2.py b/libmproxy/protocol/http2.py
index 04ff8bf6..c121637c 100644
--- a/libmproxy/protocol/http2.py
+++ b/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):
@@ -131,6 +129,12 @@ class Http2Layer(Layer):
         raise NotImplementedError()
 
     def _handle_event(self, event, source_conn, other_conn, is_server):
+        self.log(
+            "HTTP2 Event from {}".format("server" if is_server else "client"),
+            "debug",
+            [repr(event)]
+        )
+
         if hasattr(event, 'stream_id'):
             if is_server and event.stream_id % 2 == 1:
                 eid = self.server_to_client_stream_ids[event.stream_id]
@@ -228,7 +232,6 @@ class Http2Layer(Layer):
                             stream.zombie = time.time()
                         return
 
-
                     frame, _ = hyperframe.frame.Frame.parse_frame_header(raw_frame[:9])
 
                     if is_server:
diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py
index 986eb964..378dd7d4 100644
--- a/libmproxy/protocol/tls.py
+++ b/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:
diff --git a/libmproxy/stateobject.py b/libmproxy/stateobject.py
index 9600ab09..a4a1ffda 100644
--- a/libmproxy/stateobject.py
+++ b/libmproxy/stateobject.py
@@ -3,6 +3,7 @@ from netlib.utils import Serializable
 
 
 class StateObject(Serializable):
+
     """
     An object with serializable state.
 
diff --git a/libmproxy/web/app.py b/libmproxy/web/app.py
index 5c479181..63b7bf1a 100644
--- a/libmproxy/web/app.py
+++ b/libmproxy/web/app.py
@@ -44,6 +44,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')