diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-04-29 09:08:33 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-04-29 09:08:33 -0400 |
| commit | 169d76b194ffd877b08c6cd2f52130eb9469d788 (patch) | |
| tree | 0bfef4aacae5763c15d8fda49c8d8f51e42dd103 /Python/import.c | |
| parent | c7befff9720377d77f919e2ef063e0e273a3b545 (diff) | |
| parent | 8f7ad672b6efa1b4fbda720d50b60bac316fcc73 (diff) | |
| download | cpython-169d76b194ffd877b08c6cd2f52130eb9469d788.tar.gz | |
merge 3.3
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 8773be46ad..805cdd7e2a 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1403,7 +1403,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); |