Browse Source

Django: Call django.setup always if available

Ask Solem 10 years ago
parent
commit
740d4d17bc
1 changed files with 5 additions and 2 deletions
  1. 5 2
      celery/fixups/django.py

+ 5 - 2
celery/fixups/django.py

@@ -134,13 +134,16 @@ class DjangoWorkerFixup(object):
         )
 
     def validate_models(self):
+        import django
+        try:
+            django.setup()
+        except AttributeError:
+            pass
         s = io.StringIO()
         try:
             from django.core.management.validation import get_validation_errors
         except ImportError:
-            import django
             from django.core.management.base import BaseCommand
-            django.setup()
             cmd = BaseCommand()
             cmd.stdout, cmd.stderr = sys.stdout, sys.stderr
             cmd.check()