Ticket #14765: little_tweak_of_tempate_rendering.patch

django/template/base.py

@@ +1 @@
+from __builtin__ import classmethod
 import imp
 import re
 from inspect import getargspec
@@ -737 +738 @@
     # extend_nodelist().
     contains_nontext = False
 
+    @classmethod
+    def mark_safe_unicode(cls, bits):
+        return mark_safe(''.join([force_unicode(b) for b in bits]))
+
     def render(self, context):
         bits = []
         for node in self:
@@ -744 +749 @@
                 bits.append(self.render_node(node, context))
             else:
                 bits.append(node)
-        return mark_safe(''.join([force_unicode(b) for b in bits]))
+        return NodeList.mark_safe_unicode(bits)
 
     def get_nodes_by_type(self, nodetype):
         "Return a list of all nodes of the given type"

django/template/defaulttags.py

@@ -192 +192 @@
         if len_values < 1:
             context.pop()
             return self.nodelist_empty.render(context)
-        nodelist = NodeList()
+        nodelist = []
         if self.is_reversed:
             values = reversed(values)
         unpack = len(self.loopvars) > 1
@@ -233 +233 @@
                 # context.
                 context.pop()
         context.pop()
-        return nodelist.render(context)
+        return NodeList.mark_safe_unicode(nodelist)
 
 class IfChangedNode(Node):
     child_nodelists = ('nodelist_true', 'nodelist_false')