From e4bf0f2c367ca77266900af3461e1ec440c8689d Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sun, 3 Mar 2013 19:58:13 +0100 Subject: [PATCH] Fixed #19942 -- Decoded errors coming from Popen commands Thanks Aymeric Augustin for reporting the issue. --- django/core/management/utils.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/django/core/management/utils.py b/django/core/management/utils.py index 769f9723c11..de6e57f0974 100644 --- 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',)): """