diff options
| author | Barry Warsaw <barry@python.org> | 2000-09-01 09:01:32 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2000-09-01 09:01:32 (GMT) |
| commit | 9bfd2bf5ede8e5d58775180d6867d81ddcdd3594 (patch) | |
| tree | cd3adf2b98bc2c0b94980df1953ae9709f46cc28 /Modules/timemodule.c | |
| parent | 72dacb80262b73a833802c0b0e5941b8cdb1d79c (diff) | |
| download | cpython-9bfd2bf5ede8e5d58775180d6867d81ddcdd3594.zip cpython-9bfd2bf5ede8e5d58775180d6867d81ddcdd3594.tar.gz cpython-9bfd2bf5ede8e5d58775180d6867d81ddcdd3594.tar.bz2 | |
Do the absolute minimal amount of modifications to eradicate
Py_FatalError() from module initialization functions. The importing
mechanism already checks for PyErr_Occurred() after module importation
and it Does The Right Thing.
Unfortunately, the following either were not compiled or tested by the
regression suite, due to issues with my development platform:
almodule.c
cdmodule.c
mpzmodule.c
puremodule.c
timingmodule.c
Diffstat (limited to 'Modules/timemodule.c')
| -rw-r--r-- | Modules/timemodule.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 8cb7484..edf09d1 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -512,14 +512,15 @@ static PyMethodDef time_methods[] = { static void ins(PyObject *d, char *name, PyObject *v) { - if (v == NULL) - Py_FatalError("Can't initialize time module -- NULL value"); - if (PyDict_SetItemString(d, name, v) != 0) - Py_FatalError( - "Can't initialize time module -- PyDict_SetItemString failed"); - Py_DECREF(v); + /* Don't worry too much about errors, they'll be caught by the + * caller of inittime(). + */ + if (v) + PyDict_SetItemString(d, name, v); + Py_XDECREF(v); } + static char module_doc[] = "This module provides various functions to manipulate time values.\n\ \n\ @@ -647,8 +648,6 @@ inittime(void) #endif /* macintosh */ #endif /* HAVE_TM_ZONE */ #endif /* !HAVE_TZNAME || __GLIBC__ */ - if (PyErr_Occurred()) - Py_FatalError("Can't initialize time module"); } |