Changeset 7084

Timestamp:

02/03/08 22:52:37 (10 months ago)

Author:

mtredinnick

Message:

Fixed #5124 -- Added a reasonable error when "extends" is not the first template tag. Patch from k0001.

Refs #6274.

Files:

• django/trunk/django/template/__init__.py (modified) (2 diffs)
• django/trunk/django/template/loader_tags.py (modified) (1 diff)

django/trunk/django/template/__init__.py

@@ -290 +290 @@
-
-    def extend_nodelist(self, nodelist, node, token):
+        if (node.must_be_first and nodelist and
+                (not isinstance(nodelist[0], TextNode) or len(nodelist) > 2)):
+            raise TemplateSyntaxError("%r must be the first tag in the template." % node)
-        nodelist.append(node)
-
@@ -709 +712 @@
-
-class Node(object):
+    # Set this to True for nodes that must be first in the template (although
+    # they can be preceded by text nodes.
+    must_be_first = False
+
-    def render(self, context):
-        "Return the node rendered as a string"

django/trunk/django/template/loader_tags.py

@@ -38 +38 @@
-
-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):
+        if self.parent_name_expr:
+            return "<ExtendsNode: extends %s>" % self.parent_name_expr.token
+        return '<ExtendsNode: extends "%s">' % self.parent_name
-
-    def get_parent(self, context):