Applied patch #1379 with a minor tweak.

PyModule_GetName() returns a char* from PyUnicode_AsString but the code in import.c was using PyString_FromString on it.

diff --git a/Python/import.c b/Python/import.c
index be456f1b50dc9b9f7c3cfc29728ca89ecc9d3b1e..a096519f0b9c8d09b8b254b359f406cf5d20db3e 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -2384,7 +2384,7 @@ PyImport_ReloadModule(PyObject *m)
                subname = name;
        else {
                PyObject *parentname, *parent;
-               parentname = PyString_FromStringAndSize(name, (subname-name));
+               parentname = PyUnicode_FromStringAndSize(name, (subname-name));
                if (parentname == NULL) {
                        imp_modules_reloading_clear();
                        return NULL;
@@ -2393,7 +2393,7 @@ PyImport_ReloadModule(PyObject *m)
                if (parent == NULL) {
                        PyErr_Format(PyExc_ImportError,
                            "reload(): parent %.200s not in sys.modules",
-                           PyString_AS_STRING(parentname));
+                            PyUnicode_AsString(parentname));
                        Py_DECREF(parentname);
                        imp_modules_reloading_clear();
                        return NULL;