use direct imports, kill dead imports

12 files changed, 52 insertions, 50 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):
diff --git a/webob/compat.py b/webob/compat.py
index dc7f6c1..0d2f08c 100644
--- a/webob/compat.py
+++ b/webob/compat.py
@@ -36,6 +36,11 @@ def bytes_(s, encoding='latin-1', errors='strict'):
         return s.encode(encoding, errors)
     return s
 
+try:
+    from queue import Queue, Empty
+except ImportError:
+    from Queue import Queue, Empty
+
 try: # pragma: no cover
     from collections import MutableMapping as DictMixin
 except ImportError:
@@ -66,13 +71,6 @@ except NameError:
     def next(v):
         return v.next()
 
-try: # pragma: no cover
-    from io import StringIO
-    from io import BytesIO
-except ImportError:
-    import StringIO
-    StringIO = BytesIO = StringIO.StringIO
-
 if PY3: # pragma: no cover
     import builtins
     exec_ = getattr(builtins, "exec")
diff --git a/webob/datetime_utils.py b/webob/datetime_utils.py
index 08ab6c1..5997024 100644
--- a/webob/datetime_utils.py
+++ b/webob/datetime_utils.py
@@ -9,9 +9,7 @@ from email.utils import mktime_tz
 from email.utils import formatdate
 
 from webob.compat import binary_type
-from webob.compat import text_type
 from webob.compat import integer_types
-from webob.compat import text_
 
 __all__ = [
     'UTC', 'timedelta_to_seconds',
diff --git a/webob/request.py b/webob/request.py
index 566ab5b..3db100e 100644
--- a/webob/request.py
+++ b/webob/request.py
@@ -26,7 +26,6 @@ from webob.compat import multidict_from_bodyfile
 from webob.compat import text_
 from webob.compat import bytes_
 from webob.compat import iteritems_
-from webob.compat import BytesIO
 from webob.cookies import Cookie
 from webob.descriptors import CHARSET_RE
 from webob.descriptors import SCHEME_RE
@@ -113,7 +112,7 @@ class BaseRequest(object):
             (unlike setting req.body_file_raw).
         """
         if not self.is_body_readable:
-            return BytesIO()
+            return io.BytesIO()
         r = self.body_file_raw
         clen = self.content_length
         if not self.is_body_seekable and clen is not None:
@@ -533,10 +532,10 @@ class BaseRequest(object):
         if not http_method_probably_has_body.get(self.method, True):
             if not value:
                 self.content_length = None
-                self.body_file_raw = BytesIO()
+                self.body_file_raw = io.BytesIO()
                 return
         self.content_length = len(value)
-        self.body_file_raw = BytesIO(value)
+        self.body_file_raw = io.BytesIO(value)
         self.is_body_seekable = True
     def _body__del(self):
         self.body = _empty_byte
@@ -959,7 +958,7 @@ class BaseRequest(object):
             Create a request from HTTP bytes data. If the bytes contain
             extra data after the request, raise a ValueError.
         """
-        f = BytesIO(b)
+        f = io.BytesIO(b)
         r = cls.from_file(f)
         if f.tell() != len(b):
             raise ValueError("The string contains more data than expected")
@@ -1177,7 +1176,7 @@ def environ_from_url(path):
         'SERVER_PROTOCOL': 'HTTP/1.0',
         'wsgi.version': (1, 0),
         'wsgi.url_scheme': scheme,
-        'wsgi.input': BytesIO(),
+        'wsgi.input': io.BytesIO(),
         'wsgi.errors': sys.stderr,
         'wsgi.multithread': False,
         'wsgi.multiprocess': False,
@@ -1219,7 +1218,7 @@ def environ_add_POST(env, data, content_type=None, encoding='utf-8'):
             raise ValueError('Please provide `POST` data as string'
                              ' for content type `%s`' % content_type)
     data = bytes_(data, encoding)
-    env['wsgi.input'] = BytesIO(data)
+    env['wsgi.input'] = io.BytesIO(data)
     env['webob.is_body_seekable'] = True
     env['CONTENT_LENGTH'] = str(len(data))
     env['CONTENT_TYPE'] = content_type
@@ -1351,7 +1350,7 @@ class FakeCGIBody(io.RawIOBase):
                                          encoding=self.encoding)[1]
             else:
                 assert 0, ('Bad content type: %r' % self.content_type)
-            self.file = BytesIO(data)
+            self.file = io.BytesIO(data)
         return self.file.readinto(buff)
 
 
@@ -1363,7 +1362,7 @@ def _get_multipart_boundary(ctype):
 
 def _encode_multipart(vars, content_type, encoding='utf-8'):
     """Encode GET or POST vars into a bytes body"""
-    f = BytesIO()
+    f = io.BytesIO()
     w = f.write
     CRLF = b'\r\n'
     boundary = _get_multipart_boundary(content_type)