aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/panels
diff options
context:
space:
mode:
authorAymeric Augustin2013-10-18 18:08:17 +0200
committerAymeric Augustin2013-10-18 18:09:15 +0200
commitccbf178a3351106e25422b898f09cdca60a1c6e5 (patch)
tree442eb02929f8b2ed640a7d864242c4ee81f4b3cd /debug_toolbar/panels
parent7196171fadb3478b660451bed344bf13c270f9af (diff)
downloaddjango-debug-toolbar-ccbf178a3351106e25422b898f09cdca60a1c6e5.tar.bz2
Fix crash with objects having a non-ASCII repr in context.
Diffstat (limited to 'debug_toolbar/panels')
-rw-r--r--debug_toolbar/panels/template.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index 8ecf5d6..f2f813c 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -7,6 +7,7 @@ from django import http
from django.conf import settings
from django.template.context import get_standard_processors
from django.test.signals import template_rendered
+from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
from django.db.models.query import QuerySet, RawQuerySet
from debug_toolbar.panels import DebugPanel
@@ -92,7 +93,7 @@ class TemplateDebugPanel(DebugPanel):
context_list.append(pformat(temp_layer))
except UnicodeEncodeError:
pass
- kwargs['context'] = context_list
+ kwargs['context'] = [force_text(item) for item in context_list]
self.templates.append(kwargs)
def nav_title(self):