Issue #9992: On Mac OS X, decode command line arguments from utf-8 instead of
the locale encoding.
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 @@
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;
}