Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Oops, forgot one: inittab.

This commit is contained in:
Guido van Rossum 1997-04-29 20:24:10 +00:00
parent 1a43ce848b
commit 0bac33b420
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Python/import.c
View File

@ -570,9 +570,9 @@ init_builtin(name)
char *name; char *name;
{ {
int i; int i;
for (i = 0; inittab[i].name != NULL; i++) { for (i = 0; _PyImport_Inittab[i].name != NULL; i++) {
if (strcmp(name, inittab[i].name) == 0) { if (strcmp(name, _PyImport_Inittab[i].name) == 0) {
if (inittab[i].initfunc == NULL) { if (_PyImport_Inittab[i].initfunc == NULL) {
PyErr_SetString(PyExc_ImportError, PyErr_SetString(PyExc_ImportError,
"Cannot re-init internal module"); "Cannot re-init internal module");
return -1; return -1;
@ -580,7 +580,7 @@ init_builtin(name)
if (Py_VerboseFlag) if (Py_VerboseFlag)
fprintf(stderr, "import %s # builtin\n", fprintf(stderr, "import %s # builtin\n",
name); name);
(*inittab[i].initfunc)(); (*_PyImport_Inittab[i].initfunc)();
if (PyErr_Occurred()) if (PyErr_Occurred())
return -1; return -1;
return 1; return 1;
@ -880,9 +880,9 @@ imp_is_builtin(self, args)
char *name; char *name;
if (!PyArg_ParseTuple(args, "s", &name)) if (!PyArg_ParseTuple(args, "s", &name))
return NULL; return NULL;
for (i = 0; inittab[i].name != NULL; i++) { for (i = 0; _PyImport_Inittab[i].name != NULL; i++) {
if (strcmp(name, inittab[i].name) == 0) { if (strcmp(name, _PyImport_Inittab[i].name) == 0) {
if (inittab[i].initfunc == NULL) if (_PyImport_Inittab[i].initfunc == NULL)
return PyInt_FromLong(-1); return PyInt_FromLong(-1);
else else
return PyInt_FromLong(1); return PyInt_FromLong(1);