From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 26 Feb 2007 22:41:45 +0000 (+0000)
Subject: When printing an unraisable error, don't print exceptions. before the name.
X-Git-Tag: v2.6a1~2137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88516a60398fff92dbf83c6ad17b03233f6db680;p=python

When printing an unraisable error, don't print exceptions. before the name.
This duplicates the behavior whening normally printing exceptions.
---

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index ee36413de7..2b0d47d1b6 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())
diff --git a/Misc/NEWS b/Misc/NEWS
index 4428670b40..c60cf39753 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 f31f025112..9a23c05282 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);