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

vstinner · vstinner · commit 937114f7043d · 2013-11-07T00:12:30.000+01:00
Replace _PyUnicode_AsString()+strcmp() with PyUnicode_CompareWithASCIIString().
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1928,10 +1928,9 @@ print_exception(PyObject f, PyObject value)`
`1928`	`1928`	`err = PyFile_WriteString("<unknown>", f);`
`1929`	`1929`	`}`
`1930`	`1930`	`else {`
`1931`		`- char* modstr = _PyUnicode_AsString(moduleName);`
`1932`		`- if (modstr && strcmp(modstr, "builtins"))`
	`1931`	`+ if (PyUnicode_CompareWithASCIIString(moduleName, "builtins") != 0)`
`1933`	`1932`	`{`
`1934`		`- err = PyFile_WriteString(modstr, f);`
	`1933`	`+ err = PyFile_WriteObject(moduleName, f, Py_PRINT_RAW);`
`1935`	`1934`	`err += PyFile_WriteString(".", f);`
`1936`	`1935`	`}`
`1937`	`1936`	`Py_DECREF(moduleName);`