[Python-checkins] r54905 - python/branches/release25-maint/Lib/cgitb.py

[georg.brandl]

Author: georg.brandl
Date: Sat Apr 21 09:28:26 2007
New Revision: 54905

Modified:
   python/branches/release25-maint/Lib/cgitb.py
Log:
Backport r54762: exceptions are no longer old-style instances.


Modified: python/branches/release25-maint/Lib/cgitb.py
==============================================================================
--- python/branches/release25-maint/Lib/cgitb.py	(original)
+++ python/branches/release25-maint/Lib/cgitb.py	Sat Apr 21 09:28:26 2007
@@ -167,7 +167,7 @@
 
     exception = ['<p>%s: %s' % (strong(pydoc.html.escape(str(etype))),
                                 pydoc.html.escape(str(evalue)))]
-    if type(evalue) is types.InstanceType:
+    if isinstance(evalue, BaseException):
         for name in dir(evalue):
             if name[:1] == '_': continue
             value = pydoc.html.repr(getattr(evalue, name))
@@ -239,7 +239,7 @@
         frames.append('\n%s\n' % '\n'.join(rows))
 
     exception = ['%s: %s' % (str(etype), str(evalue))]
-    if type(evalue) is types.InstanceType:
+    if isinstance(evalue, BaseException):
         for name in dir(evalue):
             value = pydoc.text.repr(getattr(evalue, name))
             exception.append('\n%s%s = %s' % (" "*4, name, value))