diff options
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/python.c | 11 |
2 files changed, 1 insertions, 13 deletions
@@ -10,9 +10,6 @@ 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 488aa791d7..9a71cd06da 100644 --- a/Modules/python.c +++ b/Modules/python.c @@ -41,19 +41,10 @@ main(int argc, char **argv) oldloc = strdup(setlocale(LC_ALL, NULL)); setlocale(LC_ALL, ""); 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]); -#endif - argv_copy2[i] = argv_copy[i]; if (!argv_copy[i]) return 1; + argv_copy2[i] = argv_copy[i]; } setlocale(LC_ALL, oldloc); free(oldloc); |