aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2015-08-10 20:36:47 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2015-08-10 20:36:47 +0200
commit476badf45cd085d69b6162cd48983e3cd22cefcc (patch)
tree0c7a52c4ae0d27b52bce0f93a8e244ed06dd91a1 /test
parent690b8b4f4e00d60b373b5a1481930f21bbc5054a (diff)
downloadmitmproxy-476badf45cd085d69b6162cd48983e3cd22cefcc.tar.gz
mitmproxy-476badf45cd085d69b6162cd48983e3cd22cefcc.tar.bz2
mitmproxy-476badf45cd085d69b6162cd48983e3cd22cefcc.zip
cleanup imports
Diffstat (limited to 'test')
-rw-r--r--test/http/http1/test_protocol.py1
-rw-r--r--test/http/test_semantics.py10
-rw-r--r--test/test_utils.py1
-rw-r--r--test/tservers.py3
-rw-r--r--test/websockets/test_websockets.py4
5 files changed, 9 insertions, 10 deletions
diff --git a/test/http/http1/test_protocol.py b/test/http/http1/test_protocol.py
index ff70b87d..af77c55f 100644
--- a/test/http/http1/test_protocol.py
+++ b/test/http/http1/test_protocol.py
@@ -1,6 +1,5 @@
import cStringIO
import textwrap
-import binascii
from netlib import http, odict, tcp, tutils
from netlib.http import semantics
diff --git a/test/http/test_semantics.py b/test/http/test_semantics.py
index 59364eae..7ef69dcf 100644
--- a/test/http/test_semantics.py
+++ b/test/http/test_semantics.py
@@ -1,13 +1,11 @@
-import cStringIO
-import textwrap
-import binascii
import mock
-from mock import MagicMock
-from netlib import http, odict, tcp, tutils, utils
+from netlib import http
+from netlib import odict
+from netlib import tutils
+from netlib import utils
from netlib.http import semantics
from netlib.http.semantics import CONTENT_MISSING
-from .. import tservers
class TestProtocolMixin(object):
@mock.patch("netlib.http.semantics.ProtocolMixin.assemble_response")
diff --git a/test/test_utils.py b/test/test_utils.py
index aafa1571..27fc5cc5 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,4 +1,3 @@
-import urlparse
from netlib import utils, odict, tutils
diff --git a/test/tservers.py b/test/tservers.py
index 3f3ea8b4..682a9144 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -3,7 +3,8 @@ import threading
import Queue
import cStringIO
import OpenSSL
-from netlib import tcp, certutils, tutils
+from netlib import tcp
+from netlib import tutils
class ServerThread(threading.Thread):
diff --git a/test/websockets/test_websockets.py b/test/websockets/test_websockets.py
index 9fa98172..752f2c3e 100644
--- a/test/websockets/test_websockets.py
+++ b/test/websockets/test_websockets.py
@@ -2,7 +2,9 @@ import os
from nose.tools import raises
-from netlib import tcp, http, websockets, tutils
+from netlib import tcp
+from netlib import tutils
+from netlib import websockets
from netlib.http import status_codes
from netlib.http.exceptions import *
from netlib.http.http1 import HTTP1Protocol