aboutsummaryrefslogtreecommitdiffstats
path: root/test/http
diff options
context:
space:
mode:
Diffstat (limited to 'test/http')
-rw-r--r--test/http/http1/test_protocol.py4
-rw-r--r--test/http/http2/test_frames.py4
-rw-r--r--test/http/http2/test_protocol.py4
-rw-r--r--test/http/test_authentication.py3
-rw-r--r--test/http/test_semantics.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 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")