diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-13 22:15:06 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-13 22:15:06 (GMT) |
| commit | 90bbaa57f92c48d33a4438f22899847915fb5f56 (patch) | |
| tree | d411404e57c891facb06ccddbf4142cb886bd73c | |
| parent | eb1410fc40e07d71c51b781ea2436f9e5ad90178 (diff) | |
| download | cpython-90bbaa57f92c48d33a4438f22899847915fb5f56.zip cpython-90bbaa57f92c48d33a4438f22899847915fb5f56.tar.gz cpython-90bbaa57f92c48d33a4438f22899847915fb5f56.tar.bz2 | |
Issue #9992: On Mac OS X, decode command line arguments from utf-8 instead of
the locale encoding.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/python.c | 10 |
2 files changed, 12 insertions, 1 deletions
@@ -10,6 +10,9 @@ What's New in Python 3.2 Beta 1? 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. Library diff --git a/Modules/python.c b/Modules/python.c index 22fbdb5..540bcfe 100644 --- a/Modules/python.c +++ b/Modules/python.c @@ -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; } |