summaryrefslogtreecommitdiff
path: root/Python/frozenmain.c
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-10-03 06:03:25 +0000
committerMartin Panter <vadmium+py@gmail.com>2015-10-03 06:03:25 +0000
commitba24434c96ff4cbd21d189a4912e536cec4f8cdc (patch)
tree155e4262c4b72c7d4198195f2566efce41ac8b51 /Python/frozenmain.c
parent59357b4b8349f52b2c8c92e2da78270e7af9e121 (diff)
parent9a7ccf4627f70e2b26bc9d58d968fecf81d33329 (diff)
downloadcpython-ba24434c96ff4cbd21d189a4912e536cec4f8cdc.tar.gz
Issues #25232, #24657: Merge two CGI server fixes from 3.4 into 3.5
Diffstat (limited to 'Python/frozenmain.c')
-rw-r--r--Python/frozenmain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index b05c94a7e1..de8bd35453 100644
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -54,7 +54,7 @@ Py_FrozenMain(int argc, char **argv)
setlocale(LC_ALL, "");
for (i = 0; i < argc; i++) {
- argv_copy[i] = _Py_char2wchar(argv[i], NULL);
+ argv_copy[i] = Py_DecodeLocale(argv[i], NULL);
argv_copy2[i] = argv_copy[i];
if (!argv_copy[i]) {
fprintf(stderr, "Unable to decode the command line argument #%i\n",