Ticket #14765: little_tweak_of_tempate_rendering2.patch

django/template/base.py

@@ -735 +735 @@
                 nodes.extend(nodelist.get_nodes_by_type(nodetype))
         return nodes
 
+def mark_safe_unicode(bits):
+    return mark_safe(''.join([force_unicode(b) for b in bits]))
+
 class NodeList(list):
     # Set to True the first time a non-TextNode is inserted by
     # extend_nodelist().
@@ -747 +750 @@
                 bits.append(self.render_node(node, context))
             else:
                 bits.append(node)
-        return mark_safe(''.join([force_unicode(b) for b in bits]))
+        return 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

@@ -5 +5 @@
 from datetime import datetime
 from itertools import groupby, cycle as itertools_cycle
 
-from django.template.base import Node, NodeList, Template, Context, Variable
+from django.template.base import Node, NodeList, Template, Context, Variable, mark_safe_unicode
 from django.template.base import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END
 from django.template.base import get_library, Library, InvalidTemplateLibrary
 from django.template.smartif import IfParser, Literal
@@ -194 +194 @@
         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
@@ -235 +235 @@
                 # context.
                 context.pop()
         context.pop()
-        return nodelist.render(context)
+        return mark_safe_unicode(nodelist)
 
 class IfChangedNode(Node):
     child_nodelists = ('nodelist_true', 'nodelist_false')