summaryrefslogtreecommitdiff
path: root/Python/frozenmain.c
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-06 17:51:53 +0200
committerGeorg Brandl <georg@python.org>2014-10-06 17:51:53 +0200
commit9d2ec0c84470eb9fdec4fe87cb223a425370e6c3 (patch)
tree3114c6929ece3426beda5e1910070133715faeff /Python/frozenmain.c
parent53230dae4fce857df51a921150058eb07deca019 (diff)
parentb825edd615e1c95f78c3dfc601af978f967618f0 (diff)
downloadcpython-9d2ec0c84470eb9fdec4fe87cb223a425370e6c3.tar.gz
merge with 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",