Ticket #4523: NodeList-cleanup.patch

django/template/__init__.py

@@ -717 +717 @@
 
 class NodeList(list):
     def render(self, context):
-        bits = []
-        for node in self:
-            if isinstance(node, Node):
-                bits.append(self.render_node(node, context))
-            else:
-                bits.append(node)
-        return ''.join(bits)
+        return ''.join([node.render(context) for node in self])
 
     def get_nodes_by_type(self, nodetype):
         "Return a list of all nodes of the given type"
@@ -732 +726 @@
             nodes.extend(node.get_nodes_by_type(nodetype))
         return nodes
 
-    def render_node(self, node, context):
-        return(node.render(context))
-
 class DebugNodeList(NodeList):
-    def render_node(self, node, context):
-        try:
-            result = node.render(context)
-        except TemplateSyntaxError, e:
-            if not hasattr(e, 'source'):
-                e.source = node.source
-            raise
-        except Exception, e:
-            from sys import exc_info
-            wrapped = TemplateSyntaxError('Caught an exception while rendering: %s' % e)
-            wrapped.source = node.source
-            wrapped.exc_info = exc_info()
-            raise wrapped
-        return result
+    def render(self, context):
+        bits = []
+        for node in self:
+            try:
+                bits.append(node.render(context))
+            except TemplateSyntaxError, e:
+                if not hasattr(e, 'source'):
+                    e.source = node.source
+                raise
+            except Exception, e:
+                from sys import exc_info
+                wrapped = TemplateSyntaxError('Caught an exception while rendering: %s' % e)
+                wrapped.source = node.source
+                wrapped.exc_info = exc_info()
+                raise wrapped
+        return ''.join(bits)
 
 class TextNode(Node):
     def __init__(self, s):

django/template/defaulttags.py

@@ -95 +95 @@
         return nodes
 
     def render(self, context):
-        nodelist = NodeList()
+        nodelist = []
         if 'forloop' in context:
             parentloop = context['forloop']
         else:
@@ -141 +141 @@
                 # context.
                 context.pop()
         context.pop()
-        return nodelist.render(context)
+        return ''.join(nodelist)
 
 class IfChangedNode(Node):
     def __init__(self, nodelist, *varlist):