use direct imports, kill dead imports

9 files changed, 39 insertions, 32 deletions

diff --git a/tests/performance_test.py b/tests/performance_test.py
index 3dff2cb..ec1d559 100644
--- a/tests/performance_test.py
+++ b/tests/performance_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import webob
+from webob.response import Response
 from webob.compat import print_
 
 def make_middleware(app):
@@ -12,7 +12,7 @@ def make_middleware(app):
         path='/__profile__')
 
 def simple_app(environ, start_response):
-    resp = webob.Response('Hello world!')
+    resp = Response('Hello world!')
     return resp(environ, start_response)
 
 if __name__ == '__main__':
diff --git a/tests/test_acceptparse.py b/tests/test_acceptparse.py
index bf951eb..c7db532 100644
--- a/tests/test_acceptparse.py
+++ b/tests/test_acceptparse.py
@@ -1,5 +1,12 @@
-from webob import Request
-from webob.acceptparse import Accept, MIMEAccept, NilAccept, NoAccept, accept_property, AcceptLanguage, AcceptCharset
+from webob.request import Request
+from webob.acceptparse import Accept
+from webob.acceptparse import MIMEAccept
+from webob.acceptparse import NilAccept
+from webob.acceptparse import NoAccept
+from webob.acceptparse import accept_property
+from webob.acceptparse import AcceptLanguage
+from webob.acceptparse import AcceptCharset
+
 from nose.tools import eq_, assert_raises
 
 def test_parse_accept_badq():
diff --git a/tests/test_byterange.py b/tests/test_byterange.py
index 104c247..2dc8f51 100644
--- a/tests/test_byterange.py
+++ b/tests/test_byterange.py
@@ -1,4 +1,6 @@
-from webob.byterange import Range, ContentRange, _is_content_range_valid
+from webob.byterange import Range
+from webob.byterange import ContentRange
+from webob.byterange import _is_content_range_valid
 
 from nose.tools import assert_true, assert_false, assert_equal, assert_raises
 
diff --git a/tests/test_descriptors.py b/tests/test_descriptors.py
index 38b36a2..dff74fb 100644
--- a/tests/test_descriptors.py
+++ b/tests/test_descriptors.py
@@ -7,7 +7,7 @@ from nose.tools import eq_
 from nose.tools import ok_
 from nose.tools import assert_raises
 
-from webob import Request
+from webob.request import Request
 
 
 class GMT(tzinfo):
diff --git a/tests/test_in_wsgiref.py b/tests/test_in_wsgiref.py
index 93ad3e5..5358326 100644
--- a/tests/test_in_wsgiref.py
+++ b/tests/test_in_wsgiref.py
@@ -5,13 +5,11 @@ from webob.compat import url_open
 from webob.compat import print_
 from webob.compat import reraise
 from webob.compat import PY3
+from webob.compat import Queue
+from webob.compat import Empty
 from contextlib import contextmanager
 from nose.tools import assert_raises, eq_ as eq
 from wsgiref.simple_server import make_server, WSGIRequestHandler, WSGIServer, ServerHandler
-try:
-    from queue import Queue, Empty
-except ImportError:
-    from Queue import Queue, Empty
 
 log = logging.getLogger(__name__)
 
diff --git a/tests/test_request.py b/tests/test_request.py
index b35eff8..a1b2612 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -1,7 +1,7 @@
 import unittest, warnings
-from webob import Request
-from webob import BaseRequest
-from webob import UTC
+from webob.request import Request
+from webob.request import BaseRequest
+from webob.datetime_utils import UTC
 from webob.compat import text_type
 from webob.compat import bytes_
 from webob.compat import text_
diff --git a/tests/test_request_nose.py b/tests/test_request_nose.py
index e4512b9..b0dce3d 100644
--- a/tests/test_request_nose.py
+++ b/tests/test_request_nose.py
@@ -1,5 +1,4 @@
-import webob
-from webob import Request
+from webob.request import Request
 from nose.tools import eq_ as eq, assert_raises
 from webob.compat import bytes_
 
@@ -100,6 +99,7 @@ def test_request_wrong_clen_seekable():
     test_request_wrong_clen(is_seekable=True)
 
 def test_webob_version():
+    import webob
     assert isinstance(webob.__version__, str)
 
 class _Helper_test_request_wrong_clen(object):
diff --git a/tests/test_response.py b/tests/test_response.py
index 8da6e7b..a8c2087 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -1,12 +1,12 @@
 import zlib
+import io
 
 from nose.tools import eq_, ok_, assert_raises
 
-from webob import BaseRequest
-from webob import Request
-from webob import Response
+from webob.request import BaseRequest
+from webob.request import Request
+from webob.response import Response
 from webob.compat import md5
-from webob.compat import BytesIO
 from webob.compat import text_
 from webob.compat import bytes_
 
@@ -110,7 +110,7 @@ def test_response_copy_content_md5():
 def test_HEAD_closes():
     req = Request.blank('/')
     req.method = 'HEAD'
-    app_iter = BytesIO(b'foo')
+    app_iter = io.BytesIO(b'foo')
     res = req.get_response(Response(app_iter=app_iter))
     eq_(res.status_int, 200)
     eq_(res.body, b'')
@@ -321,7 +321,7 @@ def test_from_file():
     equal_resp(res)
 
 def equal_resp(res):
-    input_ = BytesIO(bytes_(str(res)))
+    input_ = io.BytesIO(bytes_(str(res)))
     res2 = Response.from_file(input_)
     eq_(res.body, res2.body)
     eq_(res.headers, res2.headers)
@@ -329,13 +329,13 @@ def equal_resp(res):
 def test_from_file_w_leading_space_in_header():
     # Make sure the removal of code dealing with leading spaces is safe
     res1 = Response()
-    file_w_space = BytesIO(
+    file_w_space = io.BytesIO(
         b'200 OK\n\tContent-Type: text/html; charset=UTF-8')
     res2 = Response.from_file(file_w_space)
     eq_(res1.headers, res2.headers)
 
 def test_file_bad_header():
-    file_w_bh = BytesIO(b'200 OK\nBad Header')
+    file_w_bh = io.BytesIO(b'200 OK\nBad Header')
     assert_raises(ValueError, Response.from_file, file_w_bh)
 
 def test_set_status():
@@ -705,7 +705,7 @@ def test_merge_cookies_resp_is_wsgi_callable():
 
 def test_body_get_body_is_None_len_app_iter_is_zero():
     res = Response()
-    res._app_iter = BytesIO()
+    res._app_iter = io.BytesIO()
     res._body = None
     result = res.body
     eq_(result, b'')
@@ -861,7 +861,7 @@ def test_encode_content_gzip_already_gzipped():
 
 def test_encode_content_gzip_notyet_gzipped():
     res = Response()
-    res.app_iter = BytesIO(b'foo')
+    res.app_iter = io.BytesIO(b'foo')
     result = res.encode_content('gzip')
     eq_(result, None)
     eq_(res.content_length, 23)
@@ -874,7 +874,7 @@ def test_encode_content_gzip_notyet_gzipped():
 
 def test_encode_content_gzip_notyet_gzipped_lazy():
     res = Response()
-    res.app_iter = BytesIO(b'foo')
+    res.app_iter = io.BytesIO(b'foo')
     result = res.encode_content('gzip', lazy=True)
     eq_(result, None)
     eq_(res.content_length, None)
@@ -898,11 +898,11 @@ def test_decode_content_weird():
 
 def test_decode_content_gzip():
     from gzip import GzipFile
-    io = BytesIO()
-    gzip_f = GzipFile(filename='', mode='w', fileobj=io)
+    io_ = io.BytesIO()
+    gzip_f = GzipFile(filename='', mode='w', fileobj=io_)
     gzip_f.write(b'abc')
     gzip_f.close()
-    body = io.getvalue()
+    body = io_.getvalue()
     res = Response()
     res.content_encoding = 'gzip'
     res.body = body
@@ -918,13 +918,13 @@ def test__abs_headerlist_location_with_scheme():
 
 def test_response_set_body_file1():
      data  = b'abc' 
-     file = BytesIO(data)
+     file = io.BytesIO(data)
      r = Response(body_file=file)
      assert r.body == data
 
 def test_response_set_body_file2():
     data = b'abcdef'*1024
-    file = BytesIO(data)
+    file = io.BytesIO(data)
     r = Response(body_file=file)
     assert r.body == data
 
diff --git a/tests/test_util.py b/tests/test_util.py
index b60715a..d8878fa 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,5 +1,5 @@
 import unittest
-from webob import Response
+from webob.response import Response
 
 class Test_warn_deprecation(unittest.TestCase):
     def setUp(self):