traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This modified version of a patch by Thomas Heller allows __import__ 

hooks to take over the Python import machinery at a very early stage
in the Python startup phase.

If there are still places in the Python interpreter which need to
bypass the __import__ hook, these places must now use
PyImport_ImportModuleEx() instead. So far no other places than in
the import mechanism itself have been identified.
This commit is contained in:
Marc-André Lemburg 2001-02-09 19:40:15 +00:00
parent dbbbaf2696
commit 3c61c3525f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Python/import.c
View File

@ -1458,13 +1458,13 @@ PyImport_ImportFrozenModule(char *name)
PyObject *
PyImport_ImportModule(char *name)
{
static PyObject *fromlist = NULL;
if (fromlist == NULL && strchr(name, '.') != NULL) {
fromlist = Py_BuildValue("(s)", "*");
if (fromlist == NULL)
return NULL;
}
return PyImport_ImportModuleEx(name, NULL, NULL, fromlist);
PyObject *pname;
PyObject *result;
pname = PyString_FromString(name);
result = PyImport_Import(pname);
Py_DECREF(pname);
return result;
}
/* Forward declarations for helper routines */
@ -1906,7 +1906,8 @@ PyImport_Import(PyObject *module_name)
if (standard_builtins == NULL) {
standard_builtins =
PyImport_ImportModule("__builtin__");
PyImport_ImportModuleEx("__builtin__",
NULL, NULL, NULL);
if (standard_builtins == NULL)
return NULL;
}