From 7d110042c5a2b27ffd0b3ae25dc7722f2f8bc5c5 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Apr 2013 09:08:14 -0400
Subject: raise an ImportError (rather than fatal) when __import__ is not found
 in __builtins__ (closes #17867)

---
 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 5fc2523b26..26261e1914 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1389,7 +1389,8 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
     if (builtins_import == NULL) {
         builtins_import = _PyDict_GetItemId(interp->builtins, &PyId___import__);
         if (builtins_import == NULL) {
-            Py_FatalError("__import__ missing");
+            PyErr_SetString(PyExc_ImportError, "__import__ not found");
+            goto error_with_unlock;
         }
     }
     Py_INCREF(builtins_import);
-- 
cgit v1.2.1