summaryrefslogtreecommitdiffstats
path: root/Modules/regexmodule.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/regexmodule.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/regexmodule.c')
-rw-r--r--Modules/regexmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/regexmodule.c b/Modules/regexmodule.c
index 981dc8c..7a289d5 100644
--- a/Modules/regexmodule.c
+++ b/Modules/regexmodule.c
@@ -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 */ ;
}