Ticket #6578: template_simplify.patch

template/__init__.py

@@ -289 +289 @@
         return NodeList()
 
     def extend_nodelist(self, nodelist, node, token):
-        if node.must_be_first and nodelist:
-            try:
-                if nodelist.contains_nontext:
-                    raise AttributeError
-            except AttributeError:
-                raise TemplateSyntaxError("%r must be the first tag in the template." % node)
+        if node.must_be_first and nodelist and nodelist.contains_nontext:
+            raise TemplateSyntaxError("%r must be the first tag in the template." % node)
         if isinstance(nodelist, NodeList) and not isinstance(node, TextNode):
             nodelist.contains_nontext = True
         nodelist.append(node)