celery.loaders: Removes setup_loader, and deprecates current_loader +…

… load_settings
jcsp · Sep 4, 2011 · 0f3fe52 · 0f3fe52
1 parent 7f241b6
commit 0f3fe52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/celery/loaders/__init__.py b/celery/loaders/__init__.py
@@ -3,7 +3,7 @@
 import os
 
 from .. import current_app
-from ..utils import get_cls_by_name
+from ..utils import deprecated, get_cls_by_name
 
 LOADER_ALIASES = {"app": "celery.loaders.app.AppLoader",
                   "default": "celery.loaders.default.Loader",
@@ -15,13 +15,13 @@ def get_loader_cls(loader):
     return get_cls_by_name(loader, LOADER_ALIASES)
 
 
-def setup_loader():     # XXX Deprecate
-    return get_loader_cls(os.environ.setdefault("CELERY_LOADER", "default"))()
-
-
-def current_loader():   # XXX Deprecate
+@deprecated(deprecation="2.5", removal="3.0",
+        alternative="celery.current_app.loader")
+def current_loader():
     return current_app.loader
 
 
-def load_settings():    # XXX Deprecate
+@deprecated(deprecation="2.5", removal="3.0",
+            alternative="celery.current_app.conf")
+def load_settings():
     return current_app.conf
diff --git a/celery/tests/test_app/test_loaders.py b/celery/tests/test_app/test_loaders.py
@@ -71,10 +71,6 @@ def test_current_loader(self):
     def test_load_settings(self):
         self.assertIs(loaders.load_settings(), self.app.conf)
 
-    @with_environ("CELERY_LOADER", "default")
-    def test_detect_loader_CELERY_LOADER(self):
-        self.assertIsInstance(loaders.setup_loader(), default.Loader)
-
 
 class TestLoaderBase(unittest.TestCase):
     message_options = {"subject": "Subject",