Apply two changes, systematically:

(1) Use PyErr_NewException("module.class", NULL, NULL) to create the
    exception object.

(2) Remove all calls to Py_FatalError(); instead, return or
    ignore the errors -- the import code now checks PyErr_Occurred()
    after calling a module's init function, so it's no longer a
    fatal error for the initialization to fail.

Also did some small cleanups, e.g. removed unnecessary test for
"already initialized" from initfpectl(), and unified
initposix()/initnt().

I haven't checked this very thoroughly, so while the changes are
pretty trivial -- beware of untested code!
This commit is contained in:
Guido van Rossum 1997-10-01 04:29:29 +00:00
parent ccf0a44d2d
commit 0cb96de269
27 changed files with 79 additions and 167 deletions

View file

@ -1006,7 +1006,7 @@ initcl()
m = Py_InitModule("cl", cl_methods);
d = PyModule_GetDict(m);
ClError = PyString_FromString("cl.error");
ClError = PyErr_NewException("cl.error", NULL, NULL);
(void) PyDict_SetItemString(d, "error", ClError);
#ifdef CL_ADDED_ALGORITHM_ERROR
@ -2594,10 +2594,5 @@ initcl()
Py_DECREF(x);
#endif
if (PyErr_Occurred()) {
error:
Py_FatalError("can't initialize module cl");
}
(void) clSetErrorHandler(cl_ErrorHandler);
}