diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-14 15:10:09 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-14 15:10:09 +0100 |
| commit | ea0ba6d143106eafaf6bbc15ee60e0fe82c049c0 (patch) | |
| tree | 8214328208b2d3973c5615adc05b7a412a0e445d /libmproxy/protocol | |
| parent | 5e65b933b291a4e53d27ce5671f776d828769f89 (diff) | |
| parent | 4767474d4b867f5a85c7ea9ad5b8140a7bfa8b68 (diff) | |
| download | mitmproxy-ea0ba6d143106eafaf6bbc15ee60e0fe82c049c0.tar.gz mitmproxy-ea0ba6d143106eafaf6bbc15ee60e0fe82c049c0.tar.bz2 mitmproxy-ea0ba6d143106eafaf6bbc15ee60e0fe82c049c0.zip | |
Merge pull request #935 from mitmproxy/coding-style
Improve Coding Style
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/http.py | 1 | ||||
| -rw-r--r-- | libmproxy/protocol/http1.py | 3 | ||||
| -rw-r--r-- | libmproxy/protocol/http2.py | 3 | ||||
| -rw-r--r-- | libmproxy/protocol/tls.py | 2 |
4 files changed, 1 insertions, 8 deletions
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 a65f7659..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): @@ -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: 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: |