mirror of
https://github.com/django/django.git
synced 2024-11-29 22:56:46 +01:00
Merge pull request #2481 from zsiciarz/ticket-22335
Fixed #22335 -- Fixed popen_wrapper error on non-English Windows systems.
This commit is contained in:
commit
ab4c96cff0
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user