From ccbf178a3351106e25422b898f09cdca60a1c6e5 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin
Date: Fri, 18 Oct 2013 18:08:17 +0200
Subject: Fix crash with objects having a non-ASCII repr in context.

---
 debug_toolbar/panels/template.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/panels/template.py')

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):
-- 
cgit v1.2.3