[1.7.x] Fixed #23060 -- Prevented UnicodeDecodeError in debug templatetag

Backport of 08451f17d0 from master.

2 files changed, 11 insertions, 1 deletions

diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 74998cb403..6c2f33b862 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -89,7 +89,7 @@ class CycleNode(Node):
 class DebugNode(Node):
     def render(self, context):
         from pprint import pformat
-        output = [pformat(val) for val in context]
+        output = [force_text(pformat(val)) for val in context]
         output.append('\n\n')
         output.append(pformat(sys.modules))
         return ''.join(output)
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index 9ddd6f36c7..46c4148849 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -10,6 +10,7 @@ import warnings
 
 from django import template
 from django.conf import settings
+from django.contrib.auth.models import Group
 from django.core import urlresolvers
 from django.template import (base as template_base, loader, Context,
     RequestContext, Template, TemplateSyntaxError)
@@ -524,6 +525,15 @@ class TemplateRegressionTests(TestCase):
         with self.assertRaises(urlresolvers.NoReverseMatch):
             t.render(Context({}))
 
+    def test_debug_tag_non_ascii(self):
+        """
+        Test non-ASCII model representation in debug output (#23060).
+        """
+        Group.objects.create(name="清風")
+        c1 = Context({"objs": Group.objects.all()})
+        t1 = Template('{% debug %}')
+        self.assertIn("清風", t1.render(c1))
+
 
 # Set ALLOWED_INCLUDE_ROOTS so that ssi works.
 @override_settings(MEDIA_URL="/media/", STATIC_URL="/static/",