Fixed #22335 -- Fixed popen_wrapper error on non-English Windows syst…

…ems.
django · Mar 25, 2014 · 3cdb0ba · 3cdb0ba
1 parent ff874f3
commit 3cdb0ba
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/django/core/management/utils.py b/django/core/management/utils.py
@@ -20,8 +20,10 @@ def popen_wrapper(args, os_err_exc_type=CommandError):
         p = Popen(args, shell=False, stdout=PIPE, stderr=PIPE,
                 close_fds=os.name != 'nt', universal_newlines=True)
     except OSError as e:
+        strerror = force_text(e.strerror, DEFAULT_LOCALE_ENCODING,
+                              strings_only=True)
         six.reraise(os_err_exc_type, os_err_exc_type('Error executing %s: %s' %
-                    (args[0], e.strerror)), sys.exc_info()[2])
+                    (args[0], strerror)), sys.exc_info()[2])
     output, errors = p.communicate()
     return (
         output,