From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 12 Sep 2010 08:00:41 +0000 (+0000)
Subject: Isse #8589: Decode PYTHONWARNINGS from utf-8 on Mac OS X
X-Git-Tag: v3.2a3~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c848a84fd59eabd1ab9965d376b78139eaf97f7;p=thirdparty%2FPython%2Fcpython.git

Isse #8589: Decode PYTHONWARNINGS from utf-8 on Mac OS X

Instead of the locale encoding.
---

diff --git a/Modules/main.c b/Modules/main.c
index 71fb6fa98bb6..0043d8530b50 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -488,7 +488,6 @@ Py_Main(int argc, wchar_t **argv)
 #else
     if ((p = Py_GETENV("PYTHONWARNINGS")) && *p != '\0') {
         char *buf, *oldloc;
-        wchar_t *wchar;
         PyObject *unicode;
 
         /* settle for strtok here as there's no one standard
@@ -501,11 +500,16 @@ Py_Main(int argc, wchar_t **argv)
         oldloc = strdup(setlocale(LC_ALL, NULL));
         setlocale(LC_ALL, "");
         for (p = strtok(buf, ","); p != NULL; p = strtok(NULL, ",")) {
-            wchar = _Py_char2wchar(p);
+#ifdef __APPLE__
+            /* Use utf-8 on Mac OS X */
+            unicode = PyUnicode_FromString(p);
+#else
+            wchar_t *wchar = _Py_char2wchar(p);
             if (wchar == NULL)
                 continue;
             unicode = PyUnicode_FromWideChar(wchar, wcslen(wchar));
             PyMem_Free(wchar);
+#endif
             if (unicode == NULL)
                 continue;
             PySys_AddWarnOptionUnicode(unicode);