瀏覽代碼

Merge branch 'pr/2545'

PMickael 10 年之前
父節點
當前提交
30a69f4536
共有 1 個文件被更改,包括 8 次插入1 次删除
  1. 8 1
      celery/fixups/django.py

+ 8 - 1
celery/fixups/django.py

@@ -158,7 +158,14 @@ class DjangoWorkerFixup(object):
         except ImportError:
             from django.core.management.base import 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()
         else:
             num_errors = get_validation_errors(s, None)