merge 3.3

This commit is contained in:
Benjamin Peterson 2013-04-29 09:08:33 -04:00
commit 5c089314ef
3 changed files with 11 additions and 1 deletions

View file

@ -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);