Commit e4bf0f2c authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #19942 -- Decoded errors coming from Popen commands

Thanks Aymeric Augustin for reporting the issue.
parent 97afc49b
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
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',)):
    """