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.
diff --git a/Modules/python.c b/Modules/python.c
index 488aa79..9a71cd0 100644
--- a/Modules/python.c
+++ b/Modules/python.c
@@ -41,19 +41,10 @@
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);