mirror of
https://github.com/python/cpython.git
synced 2026-01-06 15:32:22 +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
|
|
@ -801,7 +801,7 @@ PyInit_zlib()
|
|||
zlib_module_documentation,
|
||||
(PyObject*)NULL,PYTHON_API_VERSION);
|
||||
d = PyModule_GetDict(m);
|
||||
ZlibError = Py_BuildValue("s", "zlib.error");
|
||||
ZlibError = PyErr_NewException("zlib.error", NULL, NULL);
|
||||
PyDict_SetItemString(d, "error", ZlibError);
|
||||
|
||||
insint(d, "MAX_WBITS", MAX_WBITS);
|
||||
|
|
@ -815,7 +815,4 @@ PyInit_zlib()
|
|||
insint(d, "Z_DEFAULT_STRATEGY", Z_DEFAULT_STRATEGY);
|
||||
ver = PyString_FromString(ZLIB_VERSION);
|
||||
PyDict_SetItemString(d, "ZLIB_VERSION", ver);
|
||||
|
||||
if (PyErr_Occurred())
|
||||
Py_FatalError("can't initialize module zlib");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue