Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Introduce PyExc_Exception as the conceptual root class for all exceptions.

This commit is contained in:
Guido van Rossum 1997-09-16 18:43:15 +00:00
parent c56ba38350
commit 0474832d9c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Include/pyerrors.h
View File

@ -53,6 +53,7 @@ void PyErr_NormalizeException Py_PROTO((PyObject**, PyObject**, PyObject**));
/* Predefined exceptions */
extern DL_IMPORT(PyObject *) PyExc_Exception;
extern DL_IMPORT(PyObject *) PyExc_StandardError;
extern DL_IMPORT(PyObject *) PyExc_NumberError;
extern DL_IMPORT(PyObject *) PyExc_LookupError;

7
Python/bltinmodule.c
View File

@ -1724,6 +1724,7 @@ static PyMethodDef builtin_methods[] = {
/* Predefined exceptions */
PyObject *PyExc_Exception;
PyObject *PyExc_StandardError;
PyObject *PyExc_NumberError;
PyObject *PyExc_LookupError;
@ -1757,6 +1758,7 @@ static struct
int leaf_exc;
}
bltin_exc[] = {
{"Exception", &PyExc_Exception, 0},
{"StandardError", &PyExc_StandardError, 0},
{"NumberError", &PyExc_NumberError, 0},
{"LookupError", &PyExc_LookupError, 0},
@ -1901,6 +1903,11 @@ initerrors(dict)
PyTuple_SET_ITEM(PyExc_StandardError, i-1, exc);
}
PyDict_SetItemString(dict, "StandardError", PyExc_StandardError);
/* Exception is treated differently; for now, it's == StandardError */
PyExc_Exception = PyExc_StandardError;
Py_INCREF(PyExc_Exception);
PyDict_SetItemString(dict, "Exception", PyExc_Exception);
if (PyErr_Occurred())
Py_FatalError("Could not initialize built-in string exceptions");