diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-04-29 09:08:14 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-04-29 09:08:14 -0400 |
| commit | 8f7ad672b6efa1b4fbda720d50b60bac316fcc73 (patch) | |
| tree | 6bd9b8deb0f1c63b4f1524134ec34ee00cd504fb /Python/import.c | |
| parent | 11910f59474810272c8758f28394e0f8fdcf0be0 (diff) | |
| download | cpython-8f7ad672b6efa1b4fbda720d50b60bac316fcc73.tar.gz | |
raise an ImportError (rather than fatal) when __import__ is not found in __builtins__ (closes #17867)
Diffstat (limited to 'Python/import.c')
| -rw-r--r-- | Python/import.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |