Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Revert r85435 (and r85440): decode command line arguments from utf-8 

Python exits with a fatal error if the command line contains an undecodable
argument. PyUnicode_FromString() fails at the first undecodable byte because it
calls the error handler, but error handlers are not ready before Python
initialization.
This commit is contained in:
Victor Stinner 2010-10-13 23:24:06 +00:00
parent 59a289d16b
commit 052a04d34a
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,9 +10,6 @@ What's New in Python 3.2 Beta 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #9992: On Mac OS X, decode command line arguments from utf-8 instead of
the locale encoding.
- Issue #9992: Remove PYTHONFSENCODING environment variable. - Issue #9992: Remove PYTHONFSENCODING environment variable.
Library Library

11
Modules/python.c
View File

@ -41,19 +41,10 @@ main(int argc, char **argv)
oldloc = strdup(setlocale(LC_ALL, NULL)); oldloc = strdup(setlocale(LC_ALL, NULL));
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
#ifdef __APPLE__
/* Use utf-8 on Mac OS X */
PyObject *unicode = PyUnicode_FromString(argv[i]);
if (!unicode)
return 1;
argv_copy[i] = PyUnicode_AsWideCharString(unicode, NULL);
Py_DECREF(unicode);
#else
argv_copy[i] = _Py_char2wchar(argv[i]); argv_copy[i] = _Py_char2wchar(argv[i]);
#endif
argv_copy2[i] = argv_copy[i];
if (!argv_copy[i]) if (!argv_copy[i])
return 1; return 1;
argv_copy2[i] = argv_copy[i];
} }
setlocale(LC_ALL, oldloc); setlocale(LC_ALL, oldloc);
free(oldloc); free(oldloc);