autoflake

mitmproxy · Feb 14, 2016 · 6746cf5 · 6746cf5
1 parent efcfc62
commit 6746cf5
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 18 deletions.
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
@@ -242,7 +242,6 @@ def send_error_response(self, code, message):
             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
@@ -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
@@ -18,8 +18,6 @@
 from .http import _HttpTransmissionLayer, HttpLayer
 from .. import utils
 from ..models import HTTPRequest, HTTPResponse
-from ..exceptions import HttpProtocolException
-from ..exceptions import ProtocolException
 
 
 class SafeH2Connection(H2Connection):

diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py
@@ -419,7 +419,7 @@ def _establish_tls_with_client_and_server(self):
         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/test/test_console_help.py b/test/test_console_help.py
@@ -28,7 +28,7 @@ def test_helptext(self):
         assert h.helptext()
 
     def test_keypress(self):
-        master = DummyMaster()
+        DummyMaster()
         h = help.HelpView([1, 2, 3])
         assert not h.keypress((0, 0), "q")
         assert not h.keypress((0, 0), "?")

diff --git a/test/test_filt.py b/test/test_filt.py
@@ -209,7 +209,7 @@ def test_body(self):
 
     def test_method(self):
         q = self.req()
-        s = self.resp()
+        self.resp()
         assert self.q("~m get", q)
         assert not self.q("~m post", q)
 
@@ -218,7 +218,7 @@ def test_method(self):
 
     def test_domain(self):
         q = self.req()
-        s = self.resp()
+        self.resp()
         assert self.q("~d host", q)
         assert not self.q("~d none", q)
 

diff --git a/test/test_flow.py b/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,7 @@ def test_flow(self):
         assert c.flow_count() == 2
         assert c.active_flow_count() == 1
 
-        _ = HTTPResponse.wrap(netlib.tutils.tresp())
+        HTTPResponse.wrap(netlib.tutils.tresp())
         assert not c.update_flow(None)
         assert c.active_flow_count() == 1
 

diff --git a/test/test_protocol_http1.py b/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
 
 

diff --git a/test/test_protocol_http2.py b/test/test_protocol_http2.py
@@ -5,10 +5,8 @@
 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.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(