From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 6 Nov 2013 23:12:30 +0000 (+0100)
Subject: print_exception(): don't encode the module name to UTF-8
X-Git-Tag: v3.4.0b1~359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=937114f7043d6a52172a34fe04febcc5ed0eaed9;p=thirdparty%2FPython%2Fcpython.git

print_exception(): don't encode the module name to UTF-8

Replace _PyUnicode_AsString()+strcmp() with PyUnicode_CompareWithASCIIString().
---

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index e510e6f78abb..e0c863811a4b 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1928,10 +1928,9 @@ print_exception(PyObject *f, PyObject *value)
             err = PyFile_WriteString("<unknown>", f);
         }
         else {
-            char* modstr = _PyUnicode_AsString(moduleName);
-            if (modstr && strcmp(modstr, "builtins"))
+            if (PyUnicode_CompareWithASCIIString(moduleName, "builtins") != 0)
             {
-                err = PyFile_WriteString(modstr, f);
+                err = PyFile_WriteObject(moduleName, f, Py_PRINT_RAW);
                 err += PyFile_WriteString(".", f);
             }
             Py_DECREF(moduleName);