mirror of
https://github.com/python/cpython.git
synced 2025-08-29 13:15:11 +00:00
Issue #9992: On Mac OS X, decode command line arguments from utf-8 instead of
the locale encoding.
This commit is contained in:
parent
eb1410fc40
commit
90bbaa57f9
2 changed files with 12 additions and 1 deletions
|
@ -41,7 +41,15 @@ main(int argc, char **argv)
|
|||
oldloc = strdup(setlocale(LC_ALL, NULL));
|
||||
setlocale(LC_ALL, "");
|
||||
for (i = 0; i < argc; i++) {
|
||||
argv_copy2[i] = argv_copy[i] = _Py_char2wchar(argv[i]);
|
||||
#ifdef __APPLE__
|
||||
/* Use utf-8 on Mac OS X */
|
||||
PyObject *unicode = PyUnicode_FromString(argv[i]);
|
||||
argv_copy[i] = PyUnicode_AsWideCharString(unicode, NULL);
|
||||
Py_DECREF(unicode);
|
||||
#else
|
||||
argv_copy[i] = _Py_char2wchar(argv[i]);
|
||||
#endif
|
||||
argv_copy2[i] = argv_copy[i];
|
||||
if (!argv_copy[i])
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue