hrm. don't activate detectors if they're just pyc

[roundup.git] / roundup / cgi / cgitb.py

diff --git a/roundup/cgi/cgitb.py b/roundup/cgi/cgitb.py
index 69a332aff12f7ac6e04fe42eaafebaeb5d710449..1b13ab32bfb6fd457c33268b82a5f22401e22b71 100644 (file)
--- a/roundup/cgi/cgitb.py
+++ b/roundup/cgi/cgitb.py
@@ -1,13 +1,14 @@
 #
 # This module was written by Ka-Ping Yee, <ping@lfw.org>.
 # 
-# $Id: cgitb.py,v 1.2 2002-09-06 07:21:31 richard Exp $
+# $Id: cgitb.py,v 1.5 2002-09-10 01:07:05 richard Exp $
 
 __doc__ = """
 Extended CGI traceback handler by Ka-Ping Yee, <ping@lfw.org>.
 """
 
-import sys, os, types, string, keyword, linecache, tokenize, inspect, pydoc
+import sys, os, types, string, keyword, linecache, tokenize, inspect
+import pydoc, traceback
 
 from roundup.i18n import _
 
@@ -47,10 +48,14 @@ def pt_html(context=5):
                 l.append('in template %r'%context.id)
             elif len(ts) == 3:
                 supp, context, info = ts
-                l.append('in expression %r\n%s\n%s\n'%(info,
+                l.append('in expression %r\n current variables:\n%s\n%s\n'%(info,
                     niceDict('    ', context.global_vars),
                     niceDict('    ', context.local_vars)))
                 # context._scope_stack))
+
+    l.append('\n')
+    l.append(''.join(traceback.format_exception(etype, evalue,
+        sys.exc_traceback)))
     return head + cgi.escape('\n'.join(l)) + '</pre><p>&nbsp;</p>'
 
 def html(context=5):
@@ -161,43 +166,4 @@ def handler():
     print breaker()
     print html()
 
-#
-# $Log: not supported by cvs2svn $
-# Revision 1.1  2002/08/30 08:28:44  richard
-# New CGI interface support
-#
-# Revision 1.10  2002/01/16 04:49:45  richard
-# Handle a special case that the CGI interface tickles. I need to check if
-# this needs fixing in python's core.
-#
-# Revision 1.9  2002/01/08 11:56:24  richard
-# missed an import _
-#
-# Revision 1.8  2002/01/05 02:22:32  richard
-# i18n'ification
-#
-# Revision 1.7  2001/11/22 15:46:42  jhermann
-# Added module docstrings to all modules.
-#
-# Revision 1.6  2001/09/29 13:27:00  richard
-# CGI interfaces now spit up a top-level index of all the instances they can
-# serve.
-#
-# Revision 1.5  2001/08/07 00:24:42  richard
-# stupid typo
-#
-# Revision 1.4  2001/08/07 00:15:51  richard
-# Added the copyright/license notice to (nearly) all files at request of
-# Bizar Software.
-#
-# Revision 1.3  2001/07/29 07:01:39  richard
-# Added vim command to all source so that we don't get no steenkin' tabs :)
-#
-# Revision 1.2  2001/07/22 12:09:32  richard
-# Final commit of Grande Splite
-#
-# Revision 1.1  2001/07/22 11:58:35  richard
-# More Grande Splite
-#
-#
 # vim: set filetype=python ts=4 sw=4 et si