Ticket #6646: 6646.diff

django/template/loader_tags.py

@@ -87 +87 @@
                         if isinstance(node, ExtendsNode):
                             node.nodelist.append(block_node)
                         # Extends must be the first non-text node, so once you find
-                        # the first non-text node you can stop looking. 
+                        # the first non-text node you can stop looking.
                         break
             else:
                 # Keep any existing parents and add a new one. Used by BlockNode.
@@ -106 +106 @@
                 raise
             self.template = None
 
+    @property
+    def nodelist(self):
+        if not self.template:
+            return None
+        return self.template.nodelist
+
     def render(self, context):
         if self.template:
             return self.template.render(context)

tests/regressiontests/templates/tests.py

@@ -372 +372 @@
 
             # Numbers as filter arguments should work
             'filter-syntax19': ('{{ var|truncatewords:1 }}', {"var": "hello world"}, "hello ..."),
-            
+
             #filters should accept empty string constants
             'filter-syntax20': ('{{ ""|default_if_none:"was none" }}', {}, ""),
 
@@ -732 +732 @@
             # Inheritance from a template that doesn't have any blocks
             'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no tags'),
 
+            # Setup a template to be included by base template
+            'inheritance28': ("{% block included %}2{% endblock %}", {}, '2'),
+
+            # Setup a base template with an include
+            'inheritance29': ("1{% include 'inheritance28' %}3", {}, '123'),
+
+            # Inheritance with overriding a block included by the parent
+            'inheritance30': ("{% extends 'inheritance29' %}{% block included %}&{% endblock %}", {}, '1&3'),
+
+            # Setup a template to be included by child template
+            'inheritance31': ("{% block included %}_{% endblock %}", {}, '_'),
+
+            # Inheritance with overriding a block through an include
+            'inheritance32': ("{% extends 'inheritance28' %}{% include 'inheritance31' %}", {}, '_'),
+
+            # Inheritance with overriding a block included by the parent through an include in the child template (combine 30+32)
+            'inheritance33': ("{% extends 'inheritance29' %}{% include 'inheritance31' %}", {}, '1_3'),
+
             ### I18N ##################################################################
 
             # {% spaceless %} tag