summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-04-29 20:24:10 (GMT)
committerGuido van Rossum <guido@python.org>1997-04-29 20:24:10 (GMT)
commit0bac33b420a8c83ade95dd632b7fc861fd7903e0 (patch)
tree68262fc1d8b825311beb3e36a201157082fe4d02
parent1a43ce848bc83d66d8ac6b368d372d10e16c87f2 (diff)
downloadcpython-0bac33b420a8c83ade95dd632b7fc861fd7903e0.zip
cpython-0bac33b420a8c83ade95dd632b7fc861fd7903e0.tar.gz
cpython-0bac33b420a8c83ade95dd632b7fc861fd7903e0.tar.bz2
Oops, forgot one: inittab.
-rw-r--r--Python/import.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Python/import.c b/Python/import.c
index 64f4e29..ea6440a 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -570,9 +570,9 @@ init_builtin(name)
char *name;
{
int i;
- for (i = 0; inittab[i].name != NULL; i++) {
- if (strcmp(name, inittab[i].name) == 0) {
- if (inittab[i].initfunc == NULL) {
+ for (i = 0; _PyImport_Inittab[i].name != NULL; i++) {
+ if (strcmp(name, _PyImport_Inittab[i].name) == 0) {
+ if (_PyImport_Inittab[i].initfunc == NULL) {
PyErr_SetString(PyExc_ImportError,
"Cannot re-init internal module");
return -1;
@@ -580,7 +580,7 @@ init_builtin(name)
if (Py_VerboseFlag)
fprintf(stderr, "import %s # builtin\n",
name);
- (*inittab[i].initfunc)();
+ (*_PyImport_Inittab[i].initfunc)();
if (PyErr_Occurred())
return -1;
return 1;
@@ -880,9 +880,9 @@ imp_is_builtin(self, args)
char *name;
if (!PyArg_ParseTuple(args, "s", &name))
return NULL;
- for (i = 0; inittab[i].name != NULL; i++) {
- if (strcmp(name, inittab[i].name) == 0) {
- if (inittab[i].initfunc == NULL)
+ for (i = 0; _PyImport_Inittab[i].name != NULL; i++) {
+ if (strcmp(name, _PyImport_Inittab[i].name) == 0) {
+ if (_PyImport_Inittab[i].initfunc == NULL)
return PyInt_FromLong(-1);
else
return PyInt_FromLong(1);