From 09b86d1196427f2028d7e072b106847d8c693815 Mon Sep 17 00:00:00 2001
From: Brian Curtin <brian@python.org>
Date: Tue, 17 Apr 2012 16:57:09 -0500
Subject: Fix #14600. Correct reference handling and naming of ImportError
 convenience function

---
 Python/import.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Python/import.c')

diff --git a/Python/import.c b/Python/import.c
index 584f30eb38..f3de7d8262 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2460,7 +2460,8 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
         PyObject *msg = PyUnicode_FromFormat("import of %R halted; "
                                              "None in sys.modules", abs_name);
         if (msg != NULL) {
-            PyErr_SetFromImportErrorWithName(msg, abs_name);
+            PyErr_SetImportError(msg, abs_name, NULL);
+            Py_DECREF(msg);
         }
         mod = NULL;
         goto error_with_unlock;
-- 
cgit v1.2.1