From 90bbaa57f92c48d33a4438f22899847915fb5f56 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 13 Oct 2010 22:15:06 +0000
Subject: Issue #9992: On Mac OS X, decode command line arguments from utf-8
 instead of the locale encoding.

---
 Modules/python.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'Modules/python.c')

diff --git a/Modules/python.c b/Modules/python.c
index 22fbdb5b0a..540bcfe1a4 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;
     }
-- 
cgit v1.2.1