summaryrefslogtreecommitdiffstats
path: root/Modules/structmodule.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/structmodule.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/structmodule.c')
-rw-r--r--Modules/structmodule.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/Modules/structmodule.c b/Modules/structmodule.c
index ef35bd7..4b01f4b 100644
--- a/Modules/structmodule.c
+++ b/Modules/structmodule.c
@@ -1298,10 +1298,8 @@ initstruct()
/* Add some symbolic constants to the module */
d = PyModule_GetDict(m);
- StructError = PyString_FromString("struct.error");
+ StructError = PyErr_NewException("struct.error", NULL, NULL);
+ if (StructError == NULL)
+ return;
PyDict_SetItemString(d, "error", StructError);
-
- /* Check for errors */
- if (PyErr_Occurred())
- Py_FatalError("can't initialize module struct");
}