Merge branch 'master' of github.com:ask/celery

FAQ

@@ -780,7 +780,7 @@ celeryd keeps spawning processes at startup
 **Answer**: This is a known issue on Windows.
 You have to start celeryd with the command::
 
-    $ python -m celeryd.bin.celeryd
+    $ python -m celery.bin.celeryd
 
 Any additional arguments can be appended to this command.
 

celery/loaders/__init__.py

@@ -12,7 +12,6 @@
 """
 from __future__ import absolute_import
 
-from celery.app.state import current_app
 from celery.utils import deprecated
 from celery.utils.imports import symbol_by_name
 
@@ -20,7 +19,6 @@ LOADER_ALIASES = {"app": "celery.loaders.app:AppLoader",
                   "default": "celery.loaders.default:Loader",
                   "django": "djcelery.loaders:DjangoLoader"}
 
-
 def get_loader_cls(loader):
     """Get loader class by name/alias"""
     return symbol_by_name(loader, LOADER_ALIASES)
@@ -29,10 +27,12 @@ def get_loader_cls(loader):
 @deprecated(deprecation="2.5", removal="3.0",
         alternative="celery.current_app.loader")
 def current_loader():
+    from celery.app.state import current_app
     return current_app.loader
 
 
 @deprecated(deprecation="2.5", removal="3.0",
             alternative="celery.current_app.conf")
 def load_settings():
+    from celery.app.state import current_app
     return current_app.conf