Tests passing

celery/__init__.py

@@ -146,7 +146,7 @@ def maybe_patch_concurrency(argv=sys.argv,
         concurrency.get_implementation(pool)
 
 # Lazy loading
-from celery import local  # noqa
+from . import local  # noqa
 
 old_module, new_module = local.recreate_module(  # pragma: no cover
     __name__,

celery/bin/celery.py

@@ -1177,9 +1177,9 @@ class CeleryCommand(Command):
         colored = term.colored() if colored is None else colored
         white = colored.white
         ret = []
-        for cls, commands, color in command_classes:
+        for command_cls, commands, color in command_classes:
             ret.extend([
-                text.indent('+ {0}: '.format(white(cls)), indent),
+                text.indent('+ {0}: '.format(white(command_cls)), indent),
                 '\n'.join(
                     cls.get_command_info(
                         command, indent + 4, color, colored, app=app)

celery/task/__init__.py

@@ -9,8 +9,7 @@ If you're looking for the decorator implementation then that's in
 from __future__ import absolute_import, unicode_literals
 
 from celery._state import current_app, current_task as current
-from celery.five import LazyModule, recreate_module
-from celery.local import Proxy
+from celery.local import LazyModule, Proxy, recreate_module
 
 __all__ = [
     'BaseTask', 'Task', 'PeriodicTask', 'task', 'periodic_task',

celery/worker/consumer/mingle.py

@@ -35,7 +35,7 @@ class Mingle(bootsteps.StartStopStep):
             return conn.transport.driver_type in self.compatible_transports
 
     def start(self, c):
-        self.sync()
+        self.sync(c)
 
     def sync(self, c):
         info('mingle: searching for neighbors')

t/unit/app/test_loaders.py

@@ -173,11 +173,11 @@ class test_DefaultLoader:
         except ValueError:
             pass
         celery = sys.modules.pop('celery', None)
-        sys.modules.pop('celery.five', None)
+        sys.modules.pop('celery.local', None)
         try:
             assert l.import_from_cwd('celery')
             sys.modules.pop('celery', None)
-            sys.modules.pop('celery.five', None)
+            sys.modules.pop('celery.local', None)
             sys.path.insert(0, os.getcwd())
             assert l.import_from_cwd('celery')
         finally:

t/unit/utils/test_functional.py

@@ -143,7 +143,7 @@ class test_head_from_fun:
 
     def test_from_cls(self):
         class X(object):
-            def __call__(x, y, kwarg=1):
+            def __call__(x, y, kwarg=1):  # noqa
                 pass
 
         g = head_from_fun(X())

t/unit/worker/test_control.py

@@ -13,7 +13,7 @@ from kombu.utils.uuid import uuid
 
 from celery.five import Queue as FastQueue
 from celery.utils.timer2 import Timer
-from celery.worker import WorkController as _WC
+from celery.worker import WorkController as _WC  # noqa
 from celery.worker import consumer
 from celery.worker import control
 from celery.worker import state as worker_state