mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #9425: Create load_builtin() subfunction

Browse source 
Just move the code and some variables.
This commit is contained in:
Victor Stinner 2010-08-09 00:59:10 +00:00
parent e43f9d0ed6
commit 44c6c155d6
1 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Python/import.c
View file

@ -2013,15 +2013,52 @@ find_init_module(char *buf)
static int init_builtin(char *); /* Forward */ static int init_builtin(char *); /* Forward */
static PyObject*
load_builtin(char *name, char *pathname, int type)
{
PyObject *m, *modules;
int err;
if (pathname != NULL && pathname[0] != '\0')
name = pathname;
if (type == C_BUILTIN)
err = init_builtin(name);
else
err = PyImport_ImportFrozenModule(name);
if (err < 0)
return NULL;
if (err == 0) {
PyErr_Format(PyExc_ImportError,
"Purported %s module %.200s not found",
type == C_BUILTIN ?
"builtin" : "frozen",
name);
return NULL;
}
modules = PyImport_GetModuleDict();
m = PyDict_GetItemString(modules, name);
if (m == NULL) {
PyErr_Format(
PyExc_ImportError,
"%s module %.200s not properly initialized",
type == C_BUILTIN ?
"builtin" : "frozen",
name);
return NULL;
}
Py_INCREF(m);
return m;
}
/* Load an external module using the default search path and return /* Load an external module using the default search path and return
its module object WITH INCREMENTED REFERENCE COUNT */ its module object WITH INCREMENTED REFERENCE COUNT */
static PyObject * static PyObject *
load_module(char *name, FILE *fp, char *pathname, int type, PyObject *loader) load_module(char *name, FILE *fp, char *pathname, int type, PyObject *loader)
{ {
PyObject *modules;
PyObject *m; PyObject *m;
int err;
/* First check that there's an open file (if we need one) */ /* First check that there's an open file (if we need one) */
switch (type) { switch (type) {
@ -2057,34 +2094,7 @@ load_module(char *name, FILE *fp, char *pathname, int type, PyObject *loader)
case C_BUILTIN: case C_BUILTIN:
case PY_FROZEN: case PY_FROZEN:
if (pathname != NULL && pathname[0] != '\0') m = load_builtin(name, pathname, type);
name = pathname;
if (type == C_BUILTIN)
err = init_builtin(name);
else
err = PyImport_ImportFrozenModule(name);
if (err < 0)
return NULL;
if (err == 0) {
PyErr_Format(PyExc_ImportError,
"Purported %s module %.200s not found",
type == C_BUILTIN ?
"builtin" : "frozen",
name);
return NULL;
}
modules = PyImport_GetModuleDict();
m = PyDict_GetItemString(modules, name);
if (m == NULL) {
PyErr_Format(
PyExc_ImportError,
"%s module %.200s not properly initialized",
type == C_BUILTIN ?
"builtin" : "frozen",
name);
return NULL;
}
Py_INCREF(m);
break; break;
case IMP_HOOK: { case IMP_HOOK: {