Browse Source

Merge branch 'pr/2545'

PMickael 10 years ago
parent
commit
30a69f4536
1 changed files with 8 additions and 1 deletions
  1. 8 1
      celery/fixups/django.py

+ 8 - 1
celery/fixups/django.py

@@ -158,7 +158,14 @@ class DjangoWorkerFixup(object):
         except ImportError:
         except ImportError:
             from django.core.management.base import BaseCommand
             from django.core.management.base import BaseCommand
             cmd = BaseCommand()
             cmd = BaseCommand()
-            cmd.stdout, cmd.stderr = sys.stdout, sys.stderr
+            try:
+                # since django 1.5
+                from django.core.management.base import OutputWrapper
+                cmd.stdout = OutputWrapper(sys.stdout)
+                cmd.stderr = OutputWrapper(sys.stderr)
+            except ImportError:
+                cmd.stdout, cmd.stderr = sys.stdout, sys.stderr
+
             cmd.check()
             cmd.check()
         else:
         else:
             num_errors = get_validation_errors(s, None)
             num_errors = get_validation_errors(s, None)