Ticket #5124: must_be_first.diff

django/template/__init__.py

@@ -311 +311 @@
-        return NodeList()
-
-    def extend_nodelist(self, nodelist, node, token):
+        if node.must_be_first and len(nodelist):
+            raise TemplateSyntaxError, "%r must be the first Node on the template." % node
-        nodelist.append(node)
-
-    def enter_command(self, command, token):
@@ -780 +782 @@
-        return current
-
-class Node(object):
+    # Set this to True if the node must be the first on a NodeList.
+    must_be_first = False
+
-    def render(self, context):
-        "Return the node rendered as a string"
-        pass

django/template/loader_tags.py

@@ -37 +37 @@
-            self.parent = BlockNode(self.name, nodelist)
-
-class ExtendsNode(Node):
+    must_be_first = True
+
-    def __init__(self, nodelist, parent_name, parent_name_expr, template_dirs=None):
-        self.nodelist = nodelist
-        self.parent_name, self.parent_name_expr = parent_name, parent_name_expr
-        self.template_dirs = template_dirs
-
+    def __repr__(self):
+        return '<ExtendsNode: %s>' % self.parent_name
+
-    def get_parent(self, context):
-        if self.parent_name_expr:
-            self.parent_name = self.parent_name_expr.resolve(context)