summaryrefslogtreecommitdiffstats
path: root/Modules/imageop.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-10-01 04:29:29 (GMT)
committerGuido van Rossum <guido@python.org>1997-10-01 04:29:29 (GMT)
commit0cb96de2699fa032ef1379ebb62a4dfb66ee5fde (patch)
tree7c8fed41fb1b4ad5da7bb2fe8d0200e27c125561 /Modules/imageop.c
parentccf0a44d2dd9b754fd98c15dbef1c2e8c1b41797 (diff)
downloadcpython-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/imageop.c')
-rw-r--r--Modules/imageop.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/Modules/imageop.c b/Modules/imageop.c
index 007c83e..049908d 100644
--- a/Modules/imageop.c
+++ b/Modules/imageop.c
@@ -752,8 +752,7 @@ initimageop()
PyObject *m, *d;
m = Py_InitModule("imageop", imageop_methods);
d = PyModule_GetDict(m);
- ImageopError = PyString_FromString("imageop.error");
- if ( ImageopError == NULL ||
- PyDict_SetItemString(d,"error",ImageopError) )
- Py_FatalError("can't define imageop.error");
+ ImageopError = PyErr_NewException("imageop.error", NULL, NULL);
+ if (ImageopError != NULL)
+ PyDict_SetItemString(d, "error", ImageopError);
}