From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Thu, 13 Apr 2006 01:29:10 +0000 (+0000)
Subject: reverting r45322 -  "traceback.format_exception_only() now prepends
X-Git-Tag: v2.4.4c1~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2b1cda86cd948be5a22f2c4e42493e20f33bb8f;p=thirdparty%2FPython%2Fcpython.git

reverting r45322 -  "traceback.format_exception_only() now prepends
the exception's module name to non-builtin exceptions, like the
interpreter itself does."

Reverting because:
A - broke tests
B - changed behaviour of 2.4.
---

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index f3efc3c82c8e..17ed022617b2 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -5,9 +5,6 @@ from test.test_support import run_unittest, is_jython
 
 import traceback
 
-class TbError(Exception):
-    pass
-
 class TracebackCases(unittest.TestCase):
     # For now, a very minimal set of tests.  I want to be sure that
     # formatting of SyntaxErrors works based on changes for 2.1.
@@ -88,24 +85,6 @@ def test():
                 os.unlink(os.path.join(testdir, f))
             os.rmdir(testdir)
 
-    def raise_tberror(self):
-        raise TbError
-
-    def raise_typeerror(self):
-        raise TypeError
-
-    def test_modulename(self):
-        # Bug 860326: format_exception_only should prepend module name
-        # to exceptions not in "exceptions", like PyErr_Print does.
-        err = self.get_exception_format(self.raise_tberror, TbError)
-        self.assertEquals(len(err), 1)
-        self.assert_(err[0] == '__main__.TbError\n' or
-                     err[0] == 'test.test_traceback.TbError\n')
-
-        err = self.get_exception_format(self.raise_typeerror, TypeError)
-        self.assertEquals(err[0], 'TypeError\n')
-
-
 def test_main():
     run_unittest(TracebackCases)
 
diff --git a/Lib/traceback.py b/Lib/traceback.py
index fbdfb6a49285..95cde2bd75ca 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -159,10 +159,6 @@ def format_exception_only(etype, value):
     list = []
     if type(etype) == types.ClassType:
         stype = etype.__name__
-        if not hasattr(etype, '__module__'):
-            stype = '<unknown>.' + stype
-        elif etype.__module__ != 'exceptions':
-            stype = etype.__module__ + '.' + stype
     else:
         stype = etype
     if value is None:
diff --git a/Misc/NEWS b/Misc/NEWS
index 9d705ffb5051..e1cf2ef52cea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,10 +23,6 @@ Extension Modules
 Library
 -------
 
-- Patch #860326: traceback.format_exception_only() now prepends the
-  exception's module name to non-builtin exceptions, like the interpreter
-  itself does.
-
 - The email module's parsedate_tz function now sets the daylight savings
   flag to -1 (unknown) since it can't tell from the date whether it should
   be set.