Remove use of celery.five

t/unit/app/test_amqp.py

@@ -4,7 +4,6 @@ from case import Mock
 from kombu import Exchange, Queue
 from celery import uuid
 from celery.app.amqp import Queues, utf8dict
-from celery.five import keys
 from celery.utils.time import to_utc
 
 
@@ -109,13 +108,13 @@ class test_Queues:
         q = Queues()
         q.select(['foo', 'bar'])
         q.select_add('baz')
-        assert sorted(keys(q._consume_from)) == ['bar', 'baz', 'foo']
+        assert sorted(q._consume_from.keys()) == ['bar', 'baz', 'foo']
 
     def test_deselect(self):
         q = Queues()
         q.select(['foo', 'bar'])
         q.deselect('bar')
-        assert sorted(keys(q._consume_from)) == ['foo']
+        assert sorted(q._consume_from.keys()) == ['foo']
 
     def test_with_ha_policy_compat(self):
         q = Queues(ha_policy='all')

t/unit/app/test_control.py

@@ -3,7 +3,6 @@ from case import Mock
 from celery import uuid
 from celery.app import control
 from celery.exceptions import DuplicateNodenameWarning
-from celery.five import items
 from celery.utils.collections import LimitedSet
 
 
@@ -11,7 +10,7 @@ def _info_for_commandclass(type_):
     from celery.worker.control import Panel
     return [
         (name, info)
-        for name, info in items(Panel.meta)
+        for name, info in Panel.meta.items()
         if info.type == type_
     ]
 

t/unit/app/test_defaults.py

@@ -5,7 +5,6 @@ from celery.app.defaults import (
     _OLD_DEFAULTS, _OLD_SETTING_KEYS, _TO_NEW_KEY, _TO_OLD_KEY,
     DEFAULTS, NAMESPACES, SETTING_KEYS
 )
-from celery.five import values
 
 
 class test_defaults:
@@ -41,8 +40,8 @@ class test_defaults:
         assert not any(key.islower() for key in _TO_NEW_KEY)
         assert not any(key.isupper() for key in SETTING_KEYS)
         assert not any(key.islower() for key in _OLD_SETTING_KEYS)
-        assert not any(value.isupper() for value in values(_TO_NEW_KEY))
-        assert not any(value.islower() for value in values(_TO_OLD_KEY))
+        assert not any(value.isupper() for value in _TO_NEW_KEY.values())
+        assert not any(value.islower() for value in _TO_OLD_KEY.values())
 
         for key in _TO_NEW_KEY:
             assert key in _OLD_SETTING_KEYS

t/unit/app/test_routes.py

@@ -2,10 +2,8 @@ import pytest
 from case import ANY, Mock
 from kombu import Exchange, Queue
 from kombu.utils.functional import maybe_evaluate
-
 from celery.app import routes
 from celery.exceptions import QueueNotFound
-from celery.five import items
 from celery.utils.imports import qualname
 
 
@@ -71,7 +69,7 @@ class test_MapRoute(RouteCase):
         expand = E(self.app, self.app.amqp.queues)
         route = routes.MapRoute({self.mytask.name: self.b_queue})
         eroute = expand(route(self.mytask.name))
-        for key, value in items(self.b_queue):
+        for key, value in self.b_queue.items():
             assert eroute[key] == value
         assert route('celery.awesome') is None
 

t/unit/bin/test_base.py

@@ -6,7 +6,6 @@ from celery.bin.base import (
     Option,
     Extensions,
 )
-from celery.five import bytes_if_py2
 
 
 class MyApp(object):
@@ -315,7 +314,7 @@ class test_Command:
         cmd = MockCommand(app=app)
         with patch('celery.utils.imports.symbol_by_name') as sbn:
             from types import ModuleType
-            x = ModuleType(bytes_if_py2('proj'))
+            x = ModuleType('proj')
 
             def on_sbn(*args, **kwargs):
 

t/unit/bin/test_celery.py

@@ -1,3 +1,4 @@
+import io
 import pytest
 import sys
 
@@ -27,7 +28,6 @@ from celery.bin.celery import (
     main as mainfun,
     _RemoteControl,
 )
-from celery.five import WhateverIO
 from celery.platforms import EX_FAILURE, EX_USAGE, EX_OK
 
 
@@ -61,8 +61,8 @@ class test_Command:
         assert str(x)
 
     def setup(self):
-        self.out = WhateverIO()
-        self.err = WhateverIO()
+        self.out = io.StringIO()
+        self.err = io.StringIO()
         self.cmd = Command(self.app, stdout=self.out, stderr=self.err)
 
     def test_error(self):

t/unit/bin/test_celeryevdump.py

@@ -1,19 +1,16 @@
+import io
 from time import time
-
 from case import Mock, patch
-
 from celery.events.dumper import (
     humanize_type,
     Dumper,
     evdump,
 )
-from celery.five import WhateverIO
-
 
 class test_Dumper:
 
     def setup(self):
-        self.out = WhateverIO()
+        self.out = io.StringIO()
         self.dumper = Dumper(out=self.out)
 
     def test_humanize_type(self):

t/unit/bin/test_multi.py

@@ -1,15 +1,15 @@
+import io
 import pytest
 import signal
 import sys
 from case import Mock, patch
 from celery.bin.multi import main, MultiTool, __doc__ as doc
-from celery.five import WhateverIO
 
 
 class test_MultiTool:
 
     def setup(self):
-        self.fh = WhateverIO()
+        self.fh = io.StringIO()
         self.env = {}
         self.t = MultiTool(env=self.env, fh=self.fh)
         self.t.cluster_from_argv = Mock(name='cluster_from_argv')
@@ -256,7 +256,7 @@ class test_MultiTool:
 class test_MultiTool_functional:
 
     def setup(self):
-        self.fh = WhateverIO()
+        self.fh = io.StringIO()
         self.env = {}
         self.t = MultiTool(env=self.env, fh=self.fh)
 

t/unit/contrib/test_rdb.py

@@ -1,15 +1,13 @@
 import errno
+import io
 import socket
 import pytest
-
 from case import Mock, patch, skip
-
 from celery.contrib.rdb import (
     Rdb,
     debugger,
     set_trace,
 )
-from celery.five import WhateverIO
 
 
 class SockErr(socket.error):
@@ -37,7 +35,7 @@ class test_Rdb:
         sock = Mock()
         get_avail_port.return_value = (sock, 8000)
         sock.accept.return_value = (Mock(), ['helu'])
-        out = WhateverIO()
+        out = io.StringIO()
         with Rdb(out=out) as rdb:
             get_avail_port.assert_called()
             assert 'helu' in out.getvalue()
@@ -78,7 +76,7 @@ class test_Rdb:
     @patch('socket.socket')
     @skip.if_pypy()
     def test_get_avail_port(self, sock):
-        out = WhateverIO()
+        out = io.StringIO()
         sock.return_value.accept.return_value = (Mock(), ['helu'])
         with Rdb(out=out):
             pass

t/unit/utils/test_functional.py

@@ -1,6 +1,5 @@
 import pytest
 from kombu.utils.functional import lazy
-from celery.five import range, nextfun
 from celery.utils.functional import (
     DummyContext,
     fun_takes_argument,
@@ -80,7 +79,7 @@ def test_maybe_list():
 
 def test_mlazy():
     it = iter(range(20, 30))
-    p = mlazy(nextfun(it))
+    p = mlazy(it.__next__)
     assert p() == 20
     assert p.evaluated
     assert p() == 20

t/unit/utils/test_imports.py

@@ -1,6 +1,5 @@
 import pytest
 from case import Mock
-from celery.five import bytes_if_py2
 from celery.utils.imports import (
     NotAPackage,
     qualname,
@@ -21,9 +20,7 @@ def test_find_module():
 
 
 def test_qualname():
-    Class = type(bytes_if_py2('Fox'), (object,), {
-        '__module__': 'quick.brown',
-    })
+    Class = type('Fox', (object,), {'__module__': 'quick.brown'})
     assert qualname(Class) == 'quick.brown.Fox'
     assert qualname(Class()) == 'quick.brown.Fox'
 

t/unit/utils/test_local.py

@@ -1,7 +1,6 @@
 import pytest
 import sys
 from case import Mock, skip
-from celery.five import python_2_unicode_compatible, string, long_t
 from celery.local import (
     Proxy,
     PromiseProxy,
@@ -82,7 +81,6 @@ class test_Proxy:
     @skip.if_python3()
     def test_unicode(self):
 
-        @python_2_unicode_compatible
         class X(object):
 
             def __unicode__(self):
@@ -93,10 +91,10 @@ class test_Proxy:
                 return 'REPR'
 
         x = Proxy(lambda: X())
-        assert string(x) == 'UNICODE'
+        assert str(x) == 'UNICODE'
         del(X.__unicode__)
         del(X.__str__)
-        assert string(x) == 'REPR'
+        assert str(x) == 'REPR'
 
     def test_dir(self):
 
@@ -267,8 +265,6 @@ class test_Proxy:
         x = Proxy(lambda: 10)
         assert type(x.__float__()) == float
         assert type(x.__int__()) == int
-        if not PY3:
-            assert type(x.__long__()) == long_t
         assert hex(x)
         assert oct(x)
 

t/unit/utils/test_platforms.py

@@ -1,4 +1,5 @@
 import errno
+import io
 import os
 import pytest
 import sys
@@ -10,7 +11,6 @@ from case import Mock, call, mock, patch, skip
 from celery import _find_option_with_arg
 from celery import platforms
 from celery.exceptions import SecurityError
-from celery.five import WhateverIO
 from celery.platforms import (
     get_fdmax,
     ignore_errno,
@@ -691,9 +691,9 @@ class test_Pidfile:
     def test_write_pid(self, open_, fdopen, osopen, getpid, fsync):
         getpid.return_value = 1816
         osopen.return_value = 13
-        w = fdopen.return_value = WhateverIO()
+        w = fdopen.return_value = io.StringIO()
         w.close = Mock()
-        r = open_.return_value = WhateverIO()
+        r = open_.return_value = io.StringIO()
         r.write('1816\n')
         r.seek(0)
 
@@ -719,9 +719,9 @@ class test_Pidfile:
                                 osopen, getpid, fsync):
         getpid.return_value = 1816
         osopen.return_value = 13
-        w = fdopen.return_value = WhateverIO()
+        w = fdopen.return_value = io.StringIO()
         w.close = Mock()
-        r = open_.return_value = WhateverIO()
+        r = open_.return_value = io.StringIO()
         r.write('11816\n')
         r.seek(0)
 

t/unit/utils/test_term.py

@@ -3,7 +3,6 @@ import pytest
 from case import skip
 from celery.utils import term
 from celery.utils.term import colored, fg
-from celery.five import text_t
 
 
 @skip.if_win32()
@@ -35,7 +34,7 @@ class test_colored:
         assert str(getattr(colored(), name)('f'))
 
     def test_unicode(self):
-        assert text_t(colored().green('∂bar'))
+        assert str(colored().green('∂bar'))
         assert colored().red('éefoo') + colored().green('∂bar')
         assert colored().red('foo').no_color() == 'foo'
 

t/unit/worker/test_autoscale.py

@@ -1,9 +1,7 @@
 import sys
-
+from time import monotonic
 from case import Mock, mock, patch
-
 from celery.concurrency.base import BasePool
-from celery.five import monotonic
 from celery.worker import state
 from celery.worker import autoscale
 from celery.utils.objects import Bunch