[Python-checkins] r43299 - python/trunk/Lib/traceback.py

[phillip.eby]

Author: phillip.eby
Date: Fri Mar 24 23:10:54 2006
New Revision: 43299

Modified:
   python/trunk/Lib/traceback.py
Log:
Revert r42719, because the isinstance() check wasn't redundant; formatting a
string exception was causing a TypeError.


Modified: python/trunk/Lib/traceback.py
==============================================================================
--- python/trunk/Lib/traceback.py	(original)
+++ python/trunk/Lib/traceback.py	Fri Mar 24 23:10:54 2006
@@ -158,7 +158,7 @@
     """
     list = []
     if (type(etype) == types.ClassType
-        or issubclass(etype, Exception)):
+        or (isinstance(etype, type) and issubclass(etype, Exception))):
         stype = etype.__name__
     else:
         stype = etype