fix tutils imports

12 files changed, 18 insertions, 24 deletions

diff --git a/test/http/http1/test_protocol.py b/test/http/http1/test_protocol.py
index 05bad1af..e3c3ff43 100644
--- a/test/http/http1/test_protocol.py
+++ b/test/http/http1/test_protocol.py
@@ -2,9 +2,9 @@ import cStringIO
 import textwrap
 import binascii
 
-from netlib import http, odict, tcp
+from netlib import http, odict, tcp, tutils
 from netlib.http.http1 import HTTP1Protocol
-from ... import tutils, tservers
+from ... import tservers
 
 
 def mock_protocol(data='', chunked=False):
diff --git a/test/http/http2/test_frames.py b/test/http/http2/test_frames.py
index ee2edc39..077f5bc2 100644
--- a/test/http/http2/test_frames.py
+++ b/test/http/http2/test_frames.py
@@ -1,7 +1,7 @@
 import cStringIO
-from test import tutils
 from nose.tools import assert_equal
-from netlib import tcp
+
+from netlib import tcp, tutils
 from netlib.http.http2.frame import *
 
 
diff --git a/test/http/http2/test_protocol.py b/test/http/http2/test_protocol.py
index b2d414d1..8a27bbb1 100644
--- a/test/http/http2/test_protocol.py
+++ b/test/http/http2/test_protocol.py
@@ -1,9 +1,9 @@
 import OpenSSL
 
-from netlib import tcp, odict, http
+from netlib import tcp, odict, http, tutils
 from netlib.http import http2
 from netlib.http.http2.frame import *
-from ... import tutils, tservers
+from ... import tservers
 
 
 class EchoHandler(tcp.BaseHandler):
diff --git a/test/http/test_authentication.py b/test/http/test_authentication.py
index 8f231643..5261e029 100644
--- a/test/http/test_authentication.py
+++ b/test/http/test_authentication.py
@@ -1,8 +1,7 @@
 import binascii
 
-from netlib import odict, http
+from netlib import odict, http, tutils
 from netlib.http import authentication
-from .. import tutils
 
 
 def test_parse_http_basic_auth():
diff --git a/test/http/test_semantics.py b/test/http/test_semantics.py
index 986afc39..d58a44d2 100644
--- a/test/http/test_semantics.py
+++ b/test/http/test_semantics.py
@@ -3,10 +3,10 @@ import textwrap
 import binascii
 from mock import MagicMock
 
-from netlib import http, odict, tcp
+from netlib import http, odict, tcp, tutils
 from netlib.http import http1
 from netlib.http.semantics import CONTENT_MISSING
-from .. import tutils, tservers
+from .. import tservers
 
 def test_httperror():
     e = http.exceptions.HttpError(404, "Not found")
diff --git a/test/test_certutils.py b/test/test_certutils.py
index 50df36ae..b44879f6 100644
--- a/test/test_certutils.py
+++ b/test/test_certutils.py
@@ -1,6 +1,5 @@
 import os
-from netlib import certutils
-import tutils
+from netlib import certutils, tutils
 
 # class TestDNTree:
 #     def test_simple(self):
diff --git a/test/test_odict.py b/test/test_odict.py
index d66ae59b..be3d862d 100644
--- a/test/test_odict.py
+++ b/test/test_odict.py
@@ -1,5 +1,4 @@
-from netlib import odict
-import tutils
+from netlib import odict, tutils
 
 
 class TestODict:
diff --git a/test/test_socks.py b/test/test_socks.py
index 1b6c2a32..36fc5b3d 100644
--- a/test/test_socks.py
+++ b/test/test_socks.py
@@ -1,8 +1,7 @@
 from cStringIO import StringIO
 import socket
 from nose.plugins.skip import SkipTest
-from netlib import socks, tcp
-import tutils
+from netlib import socks, tcp, tutils
 
 
 def test_client_greeting():
diff --git a/test/test_tcp.py b/test/test_tcp.py
index 289ed72f..2a5deb2b 100644
--- a/test/test_tcp.py
+++ b/test/test_tcp.py
@@ -10,8 +10,8 @@ import mock
 from OpenSSL import SSL
 import OpenSSL
 
-from netlib import tcp, certutils
-from . import tutils, tservers
+from netlib import tcp, certutils, tutils
+from . import tservers
 
 
 class EchoHandler(tcp.BaseHandler):
diff --git a/test/test_utils.py b/test/test_utils.py
index 0153030c..5e681eb6 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,7 +1,6 @@
 import urlparse
 
-from netlib import utils, odict
-import tutils
+from netlib import utils, odict, tutils
 
 
 def test_bidi():
diff --git a/test/tservers.py b/test/tservers.py
index 5e99c0e2..3f3ea8b4 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -3,8 +3,7 @@ import threading
 import Queue
 import cStringIO
 import OpenSSL
-from netlib import tcp, certutils
-from . import tutils
+from netlib import tcp, certutils, tutils
 
 
 class ServerThread(threading.Thread):
diff --git a/test/websockets/test_websockets.py b/test/websockets/test_websockets.py
index fb7ba39a..28dbb833 100644
--- a/test/websockets/test_websockets.py
+++ b/test/websockets/test_websockets.py
@@ -2,10 +2,10 @@ import os
 
 from nose.tools import raises
 
-from netlib import tcp, http, websockets
+from netlib import tcp, http, websockets, tutils
 from netlib.http.exceptions import *
 from netlib.http.http1 import HTTP1Protocol
-from .. import tutils, tservers
+from .. import tservers
 
 
 class WebSocketsEchoHandler(tcp.BaseHandler):