Update cStringIO imports.

5 files changed, 8 insertions, 13 deletions

diff --git a/pecan/middleware/debug.py b/pecan/middleware/debug.py
index f6d3e53..0203245 100644
--- a/pecan/middleware/debug.py
+++ b/pecan/middleware/debug.py
@@ -1,8 +1,9 @@
-from cStringIO import StringIO
 from traceback import print_exc
 from pprint import pformat
 import pdb
 
+from six.moves import cStringIO as StringIO
+
 from mako.template import Template
 from webob import Response
 
diff --git a/pecan/tests/compat/test_dictconfig.py b/pecan/tests/compat/test_dictconfig.py
index 7c31474..0224587 100644
--- a/pecan/tests/compat/test_dictconfig.py
+++ b/pecan/tests/compat/test_dictconfig.py
@@ -15,10 +15,7 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 import sys
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO  # noqa
+from six.moves import cStringIO as StringIO
 
 from pecan.compat.dictconfig import dictConfig
 import logging
diff --git a/pecan/tests/test_base.py b/pecan/tests/test_base.py
index 8eb69f3..64eb3e4 100644
--- a/pecan/tests/test_base.py
+++ b/pecan/tests/test_base.py
@@ -7,6 +7,7 @@ else:
     import unittest  # pragma: nocover
 
 from webtest import TestApp
+from six.moves import cStringIO as StringIO
 
 from pecan import (
     Pecan, expose, request, response, redirect, abort, make_app,
@@ -821,14 +822,13 @@ class TestRedirect(PecanTestCase):
 class TestStreamedResponse(PecanTestCase):
 
     def test_streaming_response(self):
-        import StringIO
 
         class RootController(object):
             @expose(content_type='text/plain')
             def test(self, foo):
                 if foo == 'stream':
                     # mimic large file
-                    contents = StringIO.StringIO('stream')
+                    contents = StringIO('stream')
                     response.content_type = 'application/octet-stream'
                     contents.seek(0, os.SEEK_END)
                     response.content_length = contents.tell()
@@ -1198,7 +1198,6 @@ class TestLogging(PecanTestCase):
                 logging.getLogger('pecantesting').info('HELLO WORLD')
                 return "HELLO WORLD"
 
-        from cStringIO import StringIO
         f = StringIO()
 
         app = TestApp(make_app(RootController(), logging={
@@ -1227,7 +1226,6 @@ class TestLogging(PecanTestCase):
                 logging.getLogger('pecantesting').info('HELLO WORLD')
                 return "HELLO WORLD"
 
-        from cStringIO import StringIO
         f = StringIO()
 
         from pecan.configuration import conf_from_dict
diff --git a/pecan/tests/test_hooks.py b/pecan/tests/test_hooks.py
index df72e27..9b7ce22 100644
--- a/pecan/tests/test_hooks.py
+++ b/pecan/tests/test_hooks.py
@@ -1,9 +1,7 @@
-from cStringIO import StringIO
-
 from webtest import TestApp
+from six.moves import cStringIO as StringIO
 
 from pecan import make_app, expose, redirect, abort
-from pecan.core import state
 from pecan.hooks import (
     PecanHook, TransactionHook, HookController, RequestViewerHook
 )
diff --git a/pecan/tests/test_scaffolds.py b/pecan/tests/test_scaffolds.py
index b0168e3..23d6e81 100644
--- a/pecan/tests/test_scaffolds.py
+++ b/pecan/tests/test_scaffolds.py
@@ -2,7 +2,8 @@ import os
 import sys
 import tempfile
 import shutil
-from cStringIO import StringIO
+
+from six.moves import cStringIO as StringIO
 
 from pecan.tests import PecanTestCase