From d8f1888e1764ecb32a0d04eae72739480bffd393 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Thu, 2 Aug 2001 04:15:00 +0000 Subject: Merge of descr-branch back into trunk. --- Python/exceptions.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) (limited to 'Python/exceptions.c') diff --git a/Python/exceptions.c b/Python/exceptions.c index 214d8e5e62..6fb52ca6c0 100644 --- a/Python/exceptions.c +++ b/Python/exceptions.c @@ -1056,23 +1056,36 @@ static struct { DL_EXPORT(void) -init_exceptions(void) +_PyExc_Init(void) { char *modulename = "exceptions"; int modnamesz = strlen(modulename); int i; - - PyObject *me = Py_InitModule(modulename, functions); - PyObject *mydict = PyModule_GetDict(me); - PyObject *bltinmod = PyImport_ImportModule("__builtin__"); - PyObject *bdict = PyModule_GetDict(bltinmod); - PyObject *doc = PyString_FromString(module__doc__); - PyObject *args; - - PyDict_SetItemString(mydict, "__doc__", doc); + PyObject *me, *mydict, *bltinmod, *bdict, *doc, *args; + + me = Py_InitModule(modulename, functions); + if (me == NULL) + goto err; + mydict = PyModule_GetDict(me); + if (mydict == NULL) + goto err; + bltinmod = PyImport_ImportModule("__builtin__"); + if (bltinmod == NULL) + goto err; + bdict = PyModule_GetDict(bltinmod); + if (bdict == NULL) + goto err; + doc = PyString_FromString(module__doc__); + if (doc == NULL) + goto err; + + i = PyDict_SetItemString(mydict, "__doc__", doc); Py_DECREF(doc); - if (PyErr_Occurred()) + if (i < 0) { + err: Py_FatalError("exceptions bootstrapping error."); + return; + } /* This is the base class of all exceptions, so make it first. */ if (make_Exception(modulename) || @@ -1139,7 +1152,7 @@ init_exceptions(void) DL_EXPORT(void) -fini_exceptions(void) +_PyExc_Fini(void) { int i; -- cgit v1.2.1