From 937114f7043d6a52172a34fe04febcc5ed0eaed9 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 7 Nov 2013 00:12:30 +0100 Subject: print_exception(): don't encode the module name to UTF-8 Replace _PyUnicode_AsString()+strcmp() with PyUnicode_CompareWithASCIIString(). --- Python/pythonrun.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Python/pythonrun.c b/Python/pythonrun.c index e510e6f..e0c8638 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1928,10 +1928,9 @@ print_exception(PyObject *f, PyObject *value) err = PyFile_WriteString("", 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); -- cgit v0.12