Django: Call django.setup always if available

ask · ask · commit 94b455fac979 · 2014-06-09T15:26:09.000+01:00
diff --git a/celery/fixups/django.py b/celery/fixups/django.py
@@ -134,13 +134,16 @@ def __init__(self, app):
         )
 
     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()
