diff options
| author | Guido van Rossum <guido@python.org> | 1997-10-01 04:29:29 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-10-01 04:29:29 (GMT) |
| commit | 0cb96de2699fa032ef1379ebb62a4dfb66ee5fde (patch) | |
| tree | 7c8fed41fb1b4ad5da7bb2fe8d0200e27c125561 /Modules/zlibmodule.c | |
| parent | ccf0a44d2dd9b754fd98c15dbef1c2e8c1b41797 (diff) | |
| download | cpython-0cb96de2699fa032ef1379ebb62a4dfb66ee5fde.zip cpython-0cb96de2699fa032ef1379ebb62a4dfb66ee5fde.tar.gz cpython-0cb96de2699fa032ef1379ebb62a4dfb66ee5fde.tar.bz2 | |
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!
Diffstat (limited to 'Modules/zlibmodule.c')
| -rw-r--r-- | Modules/zlibmodule.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index bc1b6f8..98dbfa5 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -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"); } |