Fixes tests

celery/__init__.py

@@ -127,9 +127,9 @@ def maybe_patch_concurrency(argv=sys.argv,
         concurrency.get_implementation(pool)
 
 # Lazy loading
-from .five import recreate_module
+from celery import five
 
-old_module, new_module = recreate_module(  # pragma: no cover
+old_module, new_module = five.recreate_module(  # pragma: no cover
     __name__,
     by_module={
         'celery.app': ['Celery', 'bugreport', 'shared_task'],

celery/five.py

@@ -296,7 +296,7 @@ def reclassmethod(method):
     return classmethod(fun_of_method(method))
 
 
-class MagicModule(ModuleType):
+class LazyModule(ModuleType):
     _compat_modules = ()
     _all_by_module = {}
     _direct = {}
@@ -322,7 +322,7 @@ class MagicModule(ModuleType):
 
 
 def create_module(name, attrs, cls_attrs=None, pkg=None,
-                  base=MagicModule, prepare_attr=None):
+                  base=LazyModule, prepare_attr=None):
     fqdn = '.'.join([pkg.__name__, name]) if pkg else name
     cls_attrs = {} if cls_attrs is None else cls_attrs
     pkg, _, modname = name.rpartition('.')
@@ -336,7 +336,7 @@ def create_module(name, attrs, cls_attrs=None, pkg=None,
 
 
 def recreate_module(name, compat_modules=(), by_module={}, direct={},
-                    base=MagicModule, **attrs):
+                    base=LazyModule, **attrs):
     old_module = sys.modules[name]
     origins = get_origins(by_module)
     compat_modules = COMPAT_MODULES.get(name, ())

celery/task/__init__.py

@@ -12,7 +12,7 @@
 from __future__ import absolute_import
 
 from celery._state import current_app, current_task as current
-from celery.five import MagicModule, recreate_module
+from celery.five import LazyModule, recreate_module
 from celery.local import Proxy
 
 __all__ = [
@@ -32,7 +32,7 @@ if STATICA_HACK:  # pragma: no cover
     from .sets import TaskSet
 
 
-class module(MagicModule):
+class module(LazyModule):
 
     def __call__(self, *args, **kwargs):
         return self.task(*args, **kwargs)

celery/tests/app/test_loaders.py

@@ -206,9 +206,11 @@ class test_DefaultLoader(AppCase):
         except ValueError:
             pass
         celery = sys.modules.pop('celery', None)
+        sys.modules.pop('celery.five', None)
         try:
             self.assertTrue(l.import_from_cwd('celery'))
             sys.modules.pop('celery', None)
+            sys.modules.pop('celery.five', None)
             sys.path.insert(0, os.getcwd())
             self.assertTrue(l.import_from_cwd('celery'))
         finally: