From c4cb3b8aa14540f730f82f64add243d6ba8b6fcd Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 4 Nov 2007 12:10:01 +0000
Subject: 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.
---
Python/import.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Python/import.c b/Python/import.c
index be456f1..a096519 100644
--- 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;
--
cgit v0.12