diff options
| -rw-r--r-- | Lib/test/test_generators.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/errors.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index ee36413..2b0d47d 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -1681,7 +1681,7 @@ Our ill-behaved code should be invoked during GC: >>> g.next() >>> del g >>> sys.stderr.getvalue().startswith( -... "Exception exceptions.RuntimeError: 'generator ignored GeneratorExit' in " +... "Exception RuntimeError: 'generator ignored GeneratorExit' in " ... ) True >>> sys.stderr = old @@ -1798,7 +1798,7 @@ to test. ... del l ... err = sys.stderr.getvalue().strip() ... err.startswith( -... "Exception exceptions.RuntimeError: RuntimeError() in <" +... "Exception RuntimeError: RuntimeError() in <" ... ) ... err.endswith("> ignored") ... len(err.splitlines()) @@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 1? Core and builtins ----------------- +- When printing an unraisable error, don't print exceptions. before the name. + This duplicates the behavior whening normally printing exceptions. + - Bug #1653736: Properly discard third argument to slot_nb_inplace_power. - PEP 352: Raising a string exception now triggers a TypeError. Attempting to diff --git a/Python/errors.c b/Python/errors.c index f31f025..9a23c05 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -603,7 +603,8 @@ PyErr_WriteUnraisable(PyObject *obj) PyFile_WriteString("<unknown>", f); else { char* modstr = PyString_AsString(moduleName); - if (modstr) + if (modstr && + strcmp(modstr, "exceptions") != 0) { PyFile_WriteString(modstr, f); PyFile_WriteString(".", f); |