diff options
| author | David Buxton | 2012-12-11 11:36:25 +0000 |
|---|---|---|
| committer | David Buxton | 2012-12-11 11:36:25 +0000 |
| commit | 3013b5a6e4c682004207e944ebea172a39e52e8c (patch) | |
| tree | ef3f3f53931e3905f64ab141147dc97d8349d813 /debug_toolbar/utils | |
| parent | 22ebebd29b5d42ae50e9681847784713fa67daf5 (diff) | |
| download | django-debug-toolbar-3013b5a6e4c682004207e944ebea172a39e52e8c.tar.bz2 | |
Python 2.5 compatibility #261
Diffstat (limited to 'debug_toolbar/utils')
| -rw-r--r-- | debug_toolbar/utils/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/debug_toolbar/utils/__init__.py b/debug_toolbar/utils/__init__.py index bfb485c..2d2ff10 100644 --- a/debug_toolbar/utils/__init__.py +++ b/debug_toolbar/utils/__init__.py @@ -56,9 +56,15 @@ def render_stacktrace(trace): stacktrace = [] for frame in trace: params = map(escape, frame[0].rsplit(os.path.sep, 1) + list(frame[1:])) + params_dict = dict((unicode(idx), v) for idx, v in enumerate(params)) try: - stacktrace.append(u'<span class="path">{0}/</span><span class="file">{1}</span> in <span class="func">{3}</span>(<span class="lineno">{2}</span>)\n <span class="code">{4}</span>'.format(*params)) - except IndexError: + stacktrace.append(u'<span class="path">%(0)s/</span>' + u'<span class="file">%(1)s</span>' + u' in <span class="func">%(3)s</span>' + u'(<span class="lineno">%(2)s</span>)\n' + u' <span class="code">%(4)s</span>' + % params_dict) + except KeyError: # This frame doesn't have the expected format, so skip it and move on to the next one continue return mark_safe('\n'.join(stacktrace)) |
