Mercurial Repository: p/roundup/code: roundup/cgi/cgitb.py comparison

comparison roundup/cgi/cgitb.py @ 2564:7500a9bb8bf9

message translator is passed by the client in function arguments; more messages marked for translation, especially in pt_html(); fix vim modeline

author	Alexander Smishlajev <a1s@users.sourceforge.net>
date	Tue, 13 Jul 2004 10:18:00 +0000
parents	cafdf8b7cc69
children	b1e614c6759f

comparison

equal deleted inserted replaced

-:420d5c2a49d9
+:7500a9bb8bf9
 #
 # This module was written by Ka-Ping Yee, <ping@lfw.org>.
 #
-# $Id: cgitb.py,v 1.11 2004-06-09 09:20:01 a1s Exp $
+# $Id: cgitb.py,v 1.12 2004-07-13 10:18:00 a1s Exp $
 """Extended CGI traceback handler by Ka-Ping Yee, <ping@lfw.org>.
 """
 __docformat__ = 'restructuredtext'
 import sys, os, types, string, keyword, linecache, tokenize, inspect, cgi
 import pydoc, traceback
-from roundup.cgi import templating
+from roundup.cgi import templating, TranslationService
-def _(msgid):
+def get_translator(i18n=None):
-return templating.translationService.gettext(msgid)
+"""Return message translation function (gettext)
+Parameters:
+i18n - translation service, such as roundup.i18n module
+or TranslationService object.
+Return ``gettext`` attribute of the ``i18n`` object, if available
+(must be a message translation function with one argument).
+If ``gettext`` cannot be obtained from ``i18n``, take default
+TranslationService.
+"""
+try:
+return i18n.gettext
+except:
+return TranslationService.get_translation().gettext
 def breaker():
 return ('<body bgcolor="white">' +
 '<font color="white" size="-5"> > </font> ' +
 '</table>' * 5)
 for k,v in dict.items():
 l.append('<tr><td><strong>%s</strong></td><td>%s</td></tr>'%(k,
 cgi.escape(repr(v))))
 return '\n'.join(l)
-def pt_html(context=5):
+def pt_html(context=5, i18n=None):
+_ = get_translator(i18n)
 esc = cgi.escape
-l = ['<h1>Templating Error</h1>',
+exc_info = [esc(str(value)) for value in sys.exc_info()[:2]]
-'<p><b>%s</b>: %s</p>'%(esc(str(sys.exc_type)),
+l = [_('<h1>Templating Error</h1>\n'
-esc(str(sys.exc_value))),
+'<p><b>%(exc_type)s</b>: %(exc_value)s</p>\n'
-'<p class="help">Debugging information follows</p>',
+'<p class="help">Debugging information follows</p>'
+) % {'exc_type': exc_info[0], 'exc_value': exc_info[1]},
 '<ol>',]
 from roundup.cgi.PageTemplates.Expressions import TraversalError
 t = inspect.trace(context)
 t.reverse()
 for frame, file, lnum, func, lines, index in t:
 if locals.has_key('__traceback_info__'):
 ti = locals['__traceback_info__']
 if isinstance(ti, TraversalError):
 s = []
 for name, info in ti.path:
-s.append('<li>"%s" (%s)</li>'%(name, esc(repr(info))))
+s.append(_('<li>"%(name)s" (%(info)s)</li>')
+% {'name': name, 'info': esc(repr(info))})
 s = '\n'.join(s)
-l.append('<li>Looking for "%s", current path:<ol>%s</ol></li>'%(
+l.append(_('<li>Looking for "%(name)s", '
-ti.name, s))
+'current path:<ol>%(path)s</ol></li>'
+) % {'name': ti.name, 'path': s})
 else:
-l.append('<li>In %s</li>'%esc(str(ti)))
+l.append(_('<li>In %s</li>') % esc(str(ti)))
 if locals.has_key('__traceback_supplement__'):
 ts = locals['__traceback_supplement__']
 if len(ts) == 2:
 supp, context = ts
-s = 'A problem occurred in your template "%s".'%str(context.id)
+s = _('A problem occurred in your template "%s".') \
+% str(context.id)
 if context._v_errors:
 s = s + '<br>' + '<br>'.join(
 [esc(x) for x in context._v_errors])
 l.append('<li>%s</li>'%s)
 elif len(ts) == 3:
 supp, context, info = ts
-l.append('''
+l.append(_('''
-<li>While evaluating the %r expression on line %d
+<li>While evaluating the %(info)r expression on line %(line)d
 <table class="otherinfo" style="font-size: 90%%">
 <tr><th colspan="2" class="header">Current variables:</th></tr>
-%s
+%(globals)s
-%s
+%(locals)s
 </table></li>
-'''%(info, context.position[0], niceDict('    ', context.global_vars),
+''') % {
-niceDict('    ', context.local_vars)))
+'info': info,
+'line': context.position[0],
+'globals': niceDict('    ', context.global_vars),
+'locals': niceDict('    ', context.local_vars)
+})
 l.append('''
 </ol>
 <table style="font-size: 80%%; color: gray">
-<tr><th class="header" align="left">Full traceback:</th></tr>
+<tr><th class="header" align="left">%s</th></tr>
 <tr><td><pre>%s</pre></td></tr>
-</table>'''%cgi.escape(''.join(traceback.format_exception(sys.exc_type,
+</table>''' % (_('Full traceback:'), cgi.escape(''.join(
-sys.exc_value, sys.exc_traceback))))
+traceback.format_exception(*sys.exc_info())
+))))
 l.append('<p>&nbsp;</p>')
 return '\n'.join(l)
-def html(context=5):
+def html(context=5, i18n=None):
+_ = get_translator(i18n)
 etype, evalue = sys.exc_type, sys.exc_value
 if type(etype) is types.ClassType:
 etype = etype.__name__
 pyver = 'Python ' + string.split(sys.version)[0] + '<br>' + sys.executable
 head = pydoc.html.heading(
-'<font size=+1><strong>%s</strong>: %s</font>'%(etype, evalue),
+_('<font size=+1><strong>%(exc_type)s</strong>: %(exc_value)s</font>')
+% {'exc_type': etype, 'exc_value': evalue},
 '#ffffff', '#777777', pyver)
 head = head + (_('<p>A problem occurred while running a Python script. '
 'Here is the sequence of function calls leading up to '
 'the error, with the most recent (innermost) call first. '
 indent = '<tt><small>%s</small>&nbsp;</tt>' % ('&nbsp;' * 5)
 traceback = []
 for frame, file, lnum, func, lines, index in inspect.trace(context):
 if file is None:
-link = '''&lt;file is None - probably inside <tt>eval</tt> or
+link = _("&lt;file is None - probably inside <tt>eval</tt> "
-<tt>exec</tt>&gt;'''
+"or <tt>exec</tt>&gt;")
 else:
 file = os.path.abspath(file)
 link = '<a href="file:%s">%s</a>' % (file, pydoc.html.escape(file))
 args, varargs, varkw, locals = inspect.getargvalues(frame)
 if func == '?':
 call = ''
 else:
-call = 'in <strong>%s</strong>' % func + inspect.formatargvalues(
+call = _('in <strong>%s</strong>') % func + inspect.formatargvalues(
 args, varargs, varkw, locals,
 formatvalue=lambda value: '=' + pydoc.html.repr(value))
 level = '''
 <table width="100%%" bgcolor="#dddddd" cellspacing=0 cellpadding=2 border=0>
 def handler():
 print breaker()
 print html()
-# vim: set filetype=python ts=4 sw=4 et si
+# vim: set filetype=python ts=4 sw=4 et si :

Mercurial > p > roundup > code

comparison roundup/cgi/cgitb.py @ 2564:7500a9bb8bf9