Browse Source

Modules in _IMPORTS / _INCLUDE are now imported in original order. Closes #1161

Ask Solem 12 years ago
parent
commit
4889f24932
1 changed files with 5 additions and 6 deletions
  1. 5 6
      celery/loaders/base.py

+ 5 - 6
celery/loaders/base.py

@@ -26,8 +26,6 @@ from celery.utils.imports import (
 )
 from celery.utils.functional import maybe_list
 
-BUILTIN_MODULES = frozenset()
-
 ERROR_ENVVAR_NOT_SET = """\
 The environment variable %r is not set,
 and as such the configuration could not be loaded.
@@ -63,7 +61,7 @@ class BaseLoader(object):
         * What modules are imported to find tasks?
 
     """
-    builtin_modules = BUILTIN_MODULES
+    builtin_modules = frozenset()
     configured = False
     error_envvar_not_set = ERROR_ENVVAR_NOT_SET
     override_backends = {}
@@ -120,9 +118,10 @@ class BaseLoader(object):
     def import_default_modules(self):
         return [
             self.import_task_module(m) for m in (
-                set(maybe_list(self.app.conf.CELERY_IMPORTS))
-                | set(maybe_list(self.app.conf.CELERY_INCLUDE))
-                | self.builtin_modules)
+                tuple(self.builtin_modules) +
+                tuple(maybe_list(self.app.conf.CELERY_IMPORTS)) +
+                tuple(maybe_list(self.app.conf.CELERY_INCLUDE))
+            )
         ]
 
     def init_worker(self):