Browse Source

Make sure autodiscover_tasks is iterable. Closes #1797

Ask Solem 11 years ago
parent
commit
be782f2363
1 changed files with 2 additions and 2 deletions
  1. 2 2
      celery/loaders/base.py

+ 2 - 2
celery/loaders/base.py

@@ -247,7 +247,7 @@ class BaseLoader(object):
 
 
     def autodiscover_tasks(self, packages, related_name='tasks'):
     def autodiscover_tasks(self, packages, related_name='tasks'):
         self.task_modules.update(
         self.task_modules.update(
-            mod.__name__ for mod in autodiscover_tasks(packages,
+            mod.__name__ for mod in autodiscover_tasks(packages or (),
                                                        related_name) if mod)
                                                        related_name) if mod)
 
 
     @property
     @property
@@ -266,7 +266,7 @@ def autodiscover_tasks(packages, related_name='tasks'):
     global _RACE_PROTECTION
     global _RACE_PROTECTION
 
 
     if _RACE_PROTECTION:
     if _RACE_PROTECTION:
-        return
+        return ()
     _RACE_PROTECTION = True
     _RACE_PROTECTION = True
     try:
     try:
         return [find_related_module(pkg, related_name) for pkg in packages]
         return [find_related_module(pkg, related_name) for pkg in packages]