mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-03 08:04:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Remove the Py_FatalError() from initpyexpat(); the Guido has decreed

Browse source 
that this is not appropriate.

Made somewhat more robust in the face of reload() (exception is not
rebuilt, etc.).

Made the exception a class exception.
This commit is contained in:
Fred Drake 2000-08-24 21:57:43 +00:00
parent fa12e13ae7
commit c23b5239ae
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Modules/pyexpat.c
View file

@ -863,24 +863,40 @@ initpyexpat(void)
/* Add some symbolic constants to the module */ /* Add some symbolic constants to the module */
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
ErrorObject = PyString_FromString("pyexpat.error"); if (ErrorObject == NULL)
ErrorObject = PyErr_NewException("pyexpat.error", NULL, NULL);
PyDict_SetItemString(d, "error", ErrorObject); PyDict_SetItemString(d, "error", ErrorObject);
PyDict_SetItemString(d, "__version__", PyDict_SetItemString(d, "__version__",
PyString_FromStringAndSize(rev+11, PyString_FromStringAndSize(rev+11,
strlen(rev+11)-2)); strlen(rev+11)-2));
sys_modules = PySys_GetObject("modules");
errors_module = PyModule_New("pyexpat.errors");
PyDict_SetItemString(d, "errors", errors_module);
PyDict_SetItemString(sys_modules, "pyexpat.errors", errors_module);
/* XXX When Expat supports some way of figuring out how it was /* XXX When Expat supports some way of figuring out how it was
compiled, this should check and set native_encoding compiled, this should check and set native_encoding
appropriately. appropriately.
*/ */
PyDict_SetItemString(d, "native_encoding", PyDict_SetItemString(d, "native_encoding",
PyString_FromString("UTF-8")); PyString_FromString("UTF-8"));
sys_modules = PySys_GetObject("modules");
{
PyObject *errmod_name = PyString_FromString("pyexpat.errors");
if (errmod_name != NULL) {
errors_module = PyDict_GetItem(errmod_name);
if (errors_module == NULL) {
errors_module = PyModule_New("pyexpat.errors");
if (errors_module != NULL) {
PyDict_SetItemString(d, "errors", errors_module);
PyDict_SetItem(sys_modules, errmod_name, errors_module);
}
}
PyDECREF(errmod_name);
if (errors_module == NULL)
/* Don't code dump later! */
return;
}
}
errors_dict = PyModule_GetDict(errors_module); errors_dict = PyModule_GetDict(errors_module);
#define MYCONST(name) \ #define MYCONST(name) \
@ -906,10 +922,6 @@ initpyexpat(void)
MYCONST(XML_ERROR_MISPLACED_XML_PI); MYCONST(XML_ERROR_MISPLACED_XML_PI);
MYCONST(XML_ERROR_UNKNOWN_ENCODING); MYCONST(XML_ERROR_UNKNOWN_ENCODING);
MYCONST(XML_ERROR_INCORRECT_ENCODING); MYCONST(XML_ERROR_INCORRECT_ENCODING);
/* Check for errors */
if (PyErr_Occurred())
Py_FatalError("can't initialize module pyexpat");
} }
void clear_handlers(xmlparseobject *self) void clear_handlers(xmlparseobject *self)