summaryrefslogtreecommitdiff
path: root/Python/frozenmain.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-10-06 21:11:25 -0400
committerBenjamin Peterson <benjamin@python.org>2014-10-06 21:11:25 -0400
commit9c06648ea3157945a37a3b38e35d71c948b998dd (patch)
tree6bc2c56520ecad5d30a8b5bbfcc2c05191cfc43f /Python/frozenmain.c
parent1c41575d9be1e2bcce4916ed170fceacf456dd65 (diff)
parent9d2ec0c84470eb9fdec4fe87cb223a425370e6c3 (diff)
downloadcpython-9c06648ea3157945a37a3b38e35d71c948b998dd.tar.gz
merge 3.4
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 55d05fc26f..cb84ed5f24 100644
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -52,7 +52,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",