Skip to content

Commit 30a69f4

Browse files
committed
Merge branch 'pr/2545'
2 parents 1082d2c + 8a2c3b1 commit 30a69f4

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

celery/fixups/django.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,14 @@ def validate_models(self):
158158
except ImportError:
159159
from django.core.management.base import BaseCommand
160160
cmd = BaseCommand()
161-
cmd.stdout, cmd.stderr = sys.stdout, sys.stderr
161+
try:
162+
# since django 1.5
163+
from django.core.management.base import OutputWrapper
164+
cmd.stdout = OutputWrapper(sys.stdout)
165+
cmd.stderr = OutputWrapper(sys.stderr)
166+
except ImportError:
167+
cmd.stdout, cmd.stderr = sys.stdout, sys.stderr
168+
162169
cmd.check()
163170
else:
164171
num_errors = get_validation_errors(s, None)

0 commit comments

Comments
 (0)