Fixed #19942 -- Decoded errors coming from Popen commands

Thanks Aymeric Augustin for reporting the issue.
insanemainframe · Mar 3, 2013 · e4bf0f2 · e4bf0f2
1 parent 97afc49
commit e4bf0f2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/django/core/management/utils.py b/django/core/management/utils.py
@@ -1,6 +1,8 @@
 import os
 from subprocess import PIPE, Popen
 
+from django.utils.encoding import force_text, DEFAULT_LOCALE_ENCODING
+
 
 def popen_wrapper(args):
     """
@@ -11,7 +13,12 @@ def popen_wrapper(args):
     p = Popen(args, shell=False, stdout=PIPE, stderr=PIPE,
               close_fds=os.name != 'nt', universal_newlines=True)
     output, errors = p.communicate()
-    return output, errors, p.returncode
+    return (
+        output,
+        force_text(errors, DEFAULT_LOCALE_ENCODING, strings_only=True),
+        p.returncode
+    )
+
 
 def handle_extensions(extensions=('html',), ignored=('py',)):
     """