summaryrefslogtreecommitdiff
path: root/Python/frozenmain.c
diff options
context:
space:
mode:
authorLars Gust?bel <lars@gustaebel.de>2015-07-02 19:41:03 +0200
committerLars Gust?bel <lars@gustaebel.de>2015-07-02 19:41:03 +0200
commita0333aa657baeb3738a8c2fe211168cb1dbab8ac (patch)
tree9d48b355036c218e706d4e0c698fc3586673bd5b /Python/frozenmain.c
parente8c3a8aa583475fa33dd8b74959193217cb56933 (diff)
parentc6050850b5f399a24702795515d02fdf06b01b4f (diff)
downloadcpython-a0333aa657baeb3738a8c2fe211168cb1dbab8ac.tar.gz
Merge with 3.4: Issue #24514: tarfile now tolerates number fields consisting of only whitespace.
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",