Ticket #14765: 14765.diff

django/template/defaulttags.py

@@ -16 +16 @@
     render_value_in_context)
 from django.template.smartif import IfParser, Literal
 from django.template.defaultfilters import date
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_text, force_unicode
 from django.utils.safestring import mark_safe
 from django.utils.html import format_html
 from django.utils import six
@@ -154 +154 @@
             len_values = len(values)
             if len_values < 1:
                 return self.nodelist_empty.render(context)
-            nodelist = NodeList()
+            nodelist = []
             if self.is_reversed:
                 values = reversed(values)
             unpack = len(self.loopvars) > 1
@@ -205 +205 @@
                     # don't want to leave any vars from the previous loop on the
                     # context.
                     context.pop()
-        return nodelist.render(context)
+        return mark_safe(''.join([force_unicode(n) for n in nodelist]))
 
 class IfChangedNode(Node):
     child_nodelists = ('nodelist_true', 'nodelist_false')