9 files changed, 7 insertions, 21 deletions
diff --git a/test/test_app.py b/test/test_app.py
index 5fb49563..f412072a 100644
--- a/test/test_app.py
+++ b/test/test_app.py
@@ -1,10 +1,3 @@
-import mock
-import socket
-import os
-import time
-from libmproxy import dump
-from netlib import certutils, tcp
-from libpathod.pathoc import Pathoc
 import tutils
 import tservers
 
diff --git a/test/test_console.py b/test/test_console.py
index 3304fdbb..9d1f8113 100644
--- a/test/test_console.py
+++ b/test/test_console.py
@@ -1,9 +1,4 @@
-import os
-import sys
-import mock
 import gc
-from os.path import normpath
-import mock_urwid
 
 import netlib.tutils
 from libmproxy import console
@@ -89,7 +84,7 @@ class TestConsoleState:
         f = self._add_request(c)
         c.add_flow_setting(f, "foo", "bar")
         assert c.get_flow_setting(f, "foo") == "bar"
-        assert c.get_flow_setting(f, "oink") == None
+        assert c.get_flow_setting(f, "oink") is None
         assert c.get_flow_setting(f, "oink", "foo") == "foo"
         assert len(c.flowsettings) == 1
         c.delete_flow(f)
diff --git a/test/test_custom_contentview.py b/test/test_custom_contentview.py
index 4b5a3e53..2538ab35 100644
--- a/test/test_custom_contentview.py
+++ b/test/test_custom_contentview.py
@@ -1,4 +1,3 @@
-from libmproxy import script, flow
 import libmproxy.contentviews as cv
 from netlib.http import Headers
 
diff --git a/test/test_filt.py b/test/test_filt.py
index 104849be..c9b8937e 100644
--- a/test/test_filt.py
+++ b/test/test_filt.py
@@ -1,5 +1,5 @@
 import cStringIO
-from libmproxy import filt, flow
+from libmproxy import filt
 from libmproxy.protocol import http
 from libmproxy.models import Error
 from netlib.http import Headers
diff --git a/test/test_flow.py b/test/test_flow.py
index d052a8e8..388182f9 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -10,7 +10,11 @@ import netlib.utils
 from netlib import odict
 from netlib.http import CONTENT_MISSING, Headers
 from libmproxy import filt, controller, tnetstring, flow
-from libmproxy.models import Error, Flow, HTTPRequest, HTTPResponse, HTTPFlow, decoded
+from libmproxy.models import Error
+from libmproxy.models import Flow
+from libmproxy.models import HTTPFlow
+from libmproxy.models import HTTPRequest
+from libmproxy.models import HTTPResponse
 from libmproxy.proxy.config import HostMatcher
 from libmproxy.proxy import ProxyConfig
 from libmproxy.proxy.server import DummyServer
diff --git a/test/test_protocol_http.py b/test/test_protocol_http.py
index 1f0386b4..c7c5c1b6 100644
--- a/test/test_protocol_http.py
+++ b/test/test_protocol_http.py
@@ -1,4 +1,3 @@
-import socket
 from io import BytesIO
 from netlib.exceptions import HttpSyntaxException
 from netlib.http import http1
diff --git a/test/test_proxy.py b/test/test_proxy.py
index b498c800..1759f07a 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -10,7 +10,6 @@ from libmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler
 from netlib.exceptions import TcpDisconnect
 import tutils
 from libpathod import test
-from netlib import http, tcp
 from netlib.http import http1
 
 
diff --git a/test/tools/passive_close.py b/test/tools/passive_close.py
index 7199ea70..87d8846c 100644
--- a/test/tools/passive_close.py
+++ b/test/tools/passive_close.py
@@ -1,5 +1,4 @@
 import SocketServer
-from threading import Thread
 from time import sleep
 
 
diff --git a/test/tservers.py b/test/tservers.py
index 5963667b..c5b23854 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -1,6 +1,5 @@
 import os.path
 import threading
-import shutil
 import tempfile
 import flask
 import mock
@@ -11,7 +10,6 @@ import libpathod.test
 import libpathod.pathoc
 from libmproxy import flow, controller
 from libmproxy.cmdline import APP_HOST, APP_PORT
-import tutils
 
 testapp = flask.Flask(__name__)