diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2007-02-26 22:22:47 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2007-02-26 22:22:47 (GMT) |
| commit | 2633c69fae7e413b2b64b01d8c0c901ae649a225 (patch) | |
| tree | 144a1f97f427f019a8ddaae96a8f0da6a09df985 /Python | |
| parent | f543348fff32ae20a9fd2c7f70a3549a3280048c (diff) | |
| download | cpython-2633c69fae7e413b2b64b01d8c0c901ae649a225.zip cpython-2633c69fae7e413b2b64b01d8c0c901ae649a225.tar.gz cpython-2633c69fae7e413b2b64b01d8c0c901ae649a225.tar.bz2 | |
Remove the exceptions builtin module, all the exceptions are already builtin.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/errors.c | 3 | ||||
| -rw-r--r-- | Python/pythonrun.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Python/errors.c b/Python/errors.c index 0e565c1..e00d3ec 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -612,7 +612,8 @@ PyErr_WriteUnraisable(PyObject *obj) PyFile_WriteString("<unknown>", f); else { char* modstr = PyString_AsString(moduleName); - if (modstr) + if (modstr && + strcmp(modstr, "__builtin__") != 0) { PyFile_WriteString(modstr, f); PyFile_WriteString(".", f); diff --git a/Python/pythonrun.c b/Python/pythonrun.c index ec1bc42..7501456 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -221,7 +221,6 @@ Py_InitializeEx(int install_sigs) /* initialize builtin exceptions */ _PyExc_Init(); - _PyImport_FixupExtension("exceptions", "exceptions"); /* phase 2 of builtins */ _PyImport_FixupExtension("__builtin__", "__builtin__"); @@ -1168,7 +1167,7 @@ PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb) err = PyFile_WriteString("<unknown>", f); else { char* modstr = PyString_AsString(moduleName); - if (modstr && strcmp(modstr, "exceptions")) + if (modstr && strcmp(modstr, "__builtin__")) { err = PyFile_WriteString(modstr, f); err += PyFile_WriteString(".", f); |