Import StringIO/BytesIO from io module

celery/five.py

@@ -11,7 +11,7 @@
 from __future__ import absolute_import
 
 __all__ = ['Counter', 'reload', 'UserList', 'UserDict', 'Queue', 'Empty',
-           'zip_longest', 'StringIO', 'BytesIO', 'map', 'string', 'string_t',
+           'zip_longest', 'map', 'string', 'string_t',
            'long_t', 'text_t', 'range', 'int_types', 'items', 'keys', 'values',
            'nextfun', 'reraise', 'WhateverIO', 'with_metaclass',
            'OrderedDict', 'THREAD_TIMEOUT_MAX', 'format_d',
@@ -53,7 +53,6 @@ if PY3:  # pragma: no cover
 
     from queue import Queue, Empty
     from itertools import zip_longest
-    from io import StringIO, BytesIO
 
     map = map
     string = str
@@ -84,6 +83,8 @@ if PY3:  # pragma: no cover
             raise value.with_traceback(tb)
         raise value
 
+    from io import StringIO
+
     class WhateverIO(StringIO):
 
         def write(self, data):
@@ -95,7 +96,6 @@ else:
     import __builtin__ as builtins  # noqa
     from Queue import Queue, Empty  # noqa
     from itertools import imap as map, izip_longest as zip_longest  # noqa
-    from StringIO import StringIO   # noqa
     string = unicode                # noqa
     string_t = basestring           # noqa
     text_t = unicode
@@ -131,7 +131,7 @@ else:
 
     exec_("""def reraise(tp, value, tb=None): raise tp, value, tb""")
 
-    BytesIO = WhateverIO = StringIO         # noqa
+    from io import StringIO as WhateverIO  # noqa
 
 
 def with_metaclass(Type, skip_attrs=set(['__dict__', '__weakref__'])):

celery/tests/compat_modules/test_http.py

@@ -3,6 +3,7 @@ from __future__ import absolute_import, unicode_literals
 
 from contextlib import contextmanager
 from functools import wraps
+from io import StringIO
 try:
     from urllib import addinfourl
 except ImportError:  # py3k
@@ -11,7 +12,7 @@ except ImportError:  # py3k
 from anyjson import dumps
 from kombu.utils.encoding import from_utf8
 
-from celery.five import StringIO, items
+from celery.five import items
 from celery.task import http
 from celery.tests.case import AppCase, Case
 

celery/utils/__init__.py

@@ -8,6 +8,7 @@
 """
 from __future__ import absolute_import, print_function
 
+import io
 import os
 import socket
 import sys
@@ -22,7 +23,7 @@ from pprint import pprint
 from kombu.entity import Exchange, Queue
 
 from celery.exceptions import CPendingDeprecationWarning, CDeprecationWarning
-from celery.five import StringIO, items, reraise, string_t
+from celery.five import items, reraise, string_t
 
 __all__ = ['worker_direct', 'warn_deprecated', 'deprecated', 'lpmerge',
            'is_iterable', 'isatty', 'cry', 'maybe_reraise', 'strtobool',
@@ -150,7 +151,7 @@ def cry(out=None, sepchr='=', seplen=49):  # pragma: no cover
     taken from https://gist.github.com/737056."""
     import threading
 
-    out = StringIO() if out is None else out
+    out = io.StringIO() if out is None else out
     P = partial(print, file=out)
 
     # get a map of threads by their ID so we can print their names

celery/worker/control.py

@@ -8,11 +8,12 @@
 """
 from __future__ import absolute_import
 
+import io
 import tempfile
 
 from kombu.utils.encoding import safe_repr
 
-from celery.five import UserDict, items, StringIO
+from celery.five import UserDict, items
 from celery.platforms import signals as _signals
 from celery.utils import timeutils
 from celery.utils.functional import maybe_list
@@ -247,7 +248,7 @@ def memsample(state, **kwargs):  # pragma: no cover
 @Panel.register
 def memdump(state, samples=10, **kwargs):  # pragma: no cover
     from celery.utils.debug import memdump
-    out = StringIO()
+    out = io.StringIO()
     memdump(file=out)
     return out.getvalue()