Ticket #5831: forloop.nodelist.patch

defaulttags.py

@@ -95 +95 @@
         return nodes
 
     def render(self, context):
-        nodelist = NodeList()
+        results = []
+
         if 'forloop' in context:
             parentloop = context['forloop']
         else:
             parentloop = {}
+
         context.push()
+
         try:
             values = self.sequence.resolve(context, True)
         except VariableDoesNotExist:
@@ -112 +115 @@
         len_values = len(values)
         if self.reversed:
             values = reversed(values)
+
         unpack = len(self.loopvars) > 1
+
         for i, item in enumerate(values):
             context['forloop'] = {
                 # shortcuts for current loop iteration number
@@ -131 +136 @@
                 context.update(dict(zip(self.loopvars, item)))
             else:
                 context[self.loopvars[0]] = item
-            for node in self.nodelist_loop:
-                nodelist.append(node.render(context))
+
+            results.append(self.nodelist_loop.render(context))
+
             if unpack:
                 # The loop variables were pushed on to the context so pop them
                 # off again. This is necessary because the tag lets the length
@@ -141 +147 @@
                 # context.
                 context.pop()
         context.pop()
-        return nodelist.render(context)
 
+        return ''.join(results)
+
 class IfChangedNode(Node):
     def __init__(self, nodelist, *varlist):
         self.nodelist = nodelist