mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
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:
parent
ccf0a44d2d
commit
0cb96de269
27 changed files with 79 additions and 167 deletions
|
@ -718,7 +718,7 @@ initregex()
|
|||
d = PyModule_GetDict(m);
|
||||
|
||||
/* Initialize regex.error exception */
|
||||
v = RegexError = PyString_FromString("regex.error");
|
||||
v = RegexError = PyErr_NewException("regex.error", NULL, NULL);
|
||||
if (v == NULL || PyDict_SetItemString(d, "error", v) != 0)
|
||||
goto finally;
|
||||
|
||||
|
@ -742,5 +742,5 @@ initregex()
|
|||
if (!PyErr_Occurred())
|
||||
return;
|
||||
finally:
|
||||
Py_FatalError("can't initialize regex module");
|
||||
/* Nothing */ ;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue