Commit 3cdb0baa authored by Zbigniew Siciarz's avatar Zbigniew Siciarz
Browse files

Fixed #22335 -- Fixed popen_wrapper error on non-English Windows systems.

parent ff874f36
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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,