13 files changed, 8 insertions, 17 deletions
diff --git a/libmproxy/console/flowdetailview.py b/libmproxy/console/flowdetailview.py
index 394ad217..f4b4262e 100644
--- a/libmproxy/console/flowdetailview.py
+++ b/libmproxy/console/flowdetailview.py
@@ -9,7 +9,6 @@ def maybe_timestamp(base, attr):
         return utils.format_timestamp_with_milli(getattr(base, attr))
     else:
         return "active"
-    pass
 
 
 def flowdetails(state, flow):
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 2c18d197..a8df423f 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 import urwid
 
-from netlib import http
 import netlib.utils
 
 from . import common, signals
diff --git a/libmproxy/console/tabs.py b/libmproxy/console/tabs.py
index fea9bbde..6893494c 100644
--- a/libmproxy/console/tabs.py
+++ b/libmproxy/console/tabs.py
@@ -1,5 +1,4 @@
 import urwid
-import signals
 
 
 class Tab(urwid.WidgetWrap):
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/__init__.py b/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
index 96318a5a..fcb5b07a 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
+++ b/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
@@ -15,7 +15,6 @@ BLACKLIST = ['jsbeautifier.unpackers.evalbased']
 class UnpackingError(Exception):
     """Badly packed source or general error. Argument is a
     meaningful description."""
-    pass
 
 def getunpackers():
     """Scans the unpackers dir, finds unpackers and add them to UNPACKERS list.
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/packer.py b/libmproxy/contrib/jsbeautifier/unpackers/packer.py
index 37aa7123..4ada669e 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/packer.py
+++ b/libmproxy/contrib/jsbeautifier/unpackers/packer.py
@@ -13,7 +13,6 @@
 """Unpacker for Dean Edward's p.a.c.k.e.r"""
 
 import re
-import string
 from . import UnpackingError
 
 PRIORITY = 1
diff --git a/libmproxy/dump.py b/libmproxy/dump.py
index c2a3268a..435037c8 100644
--- a/libmproxy/dump.py
+++ b/libmproxy/dump.py
@@ -1,6 +1,4 @@
 from __future__ import absolute_import, print_function
-import sys
-import os
 import traceback
 
 import click
@@ -10,7 +8,6 @@ from netlib.http import CONTENT_MISSING
 import netlib.utils
 from . import flow, filt, contentviews
 from .exceptions import ContentViewException
-from .models import HTTPRequest
 
 class DumpError(Exception):
     pass
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index 1f28166f..4fe5d83e 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -652,7 +652,6 @@ class FlowMaster(controller.Master):
         """
             level: debug, info, error
         """
-        pass
 
     def unload_scripts(self):
         for s in self.scripts[:]:
diff --git a/libmproxy/platform/osx.py b/libmproxy/platform/osx.py
index 2824718e..afbc919b 100644
--- a/libmproxy/platform/osx.py
+++ b/libmproxy/platform/osx.py
@@ -21,7 +21,7 @@ class Resolver(object):
         peer = csock.getpeername()
         try:
             stxt = subprocess.check_output(self.STATECMD, stderr=subprocess.STDOUT)
-        except subprocess.CalledProcessError, e:
+        except subprocess.CalledProcessError as e:
             if "sudo: a password is required" in e.output:
                 insufficient_priv = True
             else:
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py
index d8ebd4f0..d46f16f5 100644
--- a/libmproxy/protocol/__init__.py
+++ b/libmproxy/protocol/__init__.py
@@ -28,12 +28,14 @@ as late as possible; this makes server replay without any outgoing connections p
 from __future__ import (absolute_import, print_function, division)
 from .base import Layer, ServerConnectionMixin, Kill
 from .http import Http1Layer, UpstreamConnectLayer, Http2Layer
-from .tls import TlsLayer, is_tls_record_magic, TlsClientHello
+from .tls import TlsLayer
+from .tls import is_tls_record_magic
+from .tls import TlsClientHello
 from .rawtcp import RawTCPLayer
 
 __all__ = [
     "Layer", "ServerConnectionMixin", "Kill",
     "Http1Layer", "UpstreamConnectLayer", "Http2Layer",
-    "TlsLayer", "is_tls_record_magic", "TlsClientHello"
-    "RawTCPLayer"
+    "TlsLayer", "is_tls_record_magic", "TlsClientHello",
+    "RawTCPLayer",
 ]
diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py
index d984cadb..c8433e07 100644
--- a/libmproxy/protocol/base.py
+++ b/libmproxy/protocol/base.py
@@ -3,7 +3,6 @@ import sys
 
 import six
 
-from netlib import tcp
 from ..models import ServerConnection
 from ..exceptions import ProtocolException
 from netlib.exceptions import TcpException
diff --git a/libmproxy/protocol/rawtcp.py b/libmproxy/protocol/rawtcp.py
index ccd3c7ec..2902e03d 100644
--- a/libmproxy/protocol/rawtcp.py
+++ b/libmproxy/protocol/rawtcp.py
@@ -1,6 +1,5 @@
 from __future__ import (absolute_import, print_function, division)
 import socket
-import select
 import six
 import sys
 
diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py
index 6d4cac85..847ba263 100644
--- a/libmproxy/protocol/tls.py
+++ b/libmproxy/protocol/tls.py
@@ -5,7 +5,8 @@ import sys
 
 from construct import ConstructError
 import six
-from netlib.exceptions import InvalidCertificateException, TcpException, TlsException
+from netlib.exceptions import InvalidCertificateException
+from netlib.exceptions import TlsException
 
 from ..contrib.tls._constructs import ClientHello
 from ..exceptions import ProtocolException, TlsProtocolException, ClientHandshakeException
diff --git a/libmproxy/web/__init__.py b/libmproxy/web/__init__.py
index 90da6ffe..c30a2a7e 100644
--- a/libmproxy/web/__init__.py
+++ b/libmproxy/web/__init__.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import, print_function
 import collections
 import tornado.ioloop
 import tornado.httpserver
-import os
 from .. import controller, flow
 from . import app