Context Navigation

Ticket #7318: fix-extends-tag.patch

File fix-extends-tag.patch, 2.1 KB (added by Matthias Kestenholz, 16 years ago)

diff --git a/AUTHORS b/AUTHORS
index bb77b68..e2410ad 100644

                answer newbie questions, and generally made Django that much better:
     ymasuda@ethercube.com
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
+    Matthias Kestenholz <mk@spinlock.ch>
 A big THANK YOU goes to:

diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py
index 00ae99b..59955d3 100644

                class ExtendsNode(Node):
     def render(self, context):
         compiled_parent = self.get_parent(context)
         pos = 0
+        while isinstance(compiled_parent.nodelist[pos], TextNode):
+        # Prevent an IndexError when parent consists only of TextNodes
+        length = len(compiled_parent.nodelist)
+        while pos<length-1 and isinstance(compiled_parent.nodelist[pos], TextNode):
             pos += 1
         parent_is_child = isinstance(compiled_parent.nodelist[pos], ExtendsNode)
         parent_blocks = dict([(n.name, n) for n in compiled_parent.nodelist.get_nodes_by_type(BlockNode)])

diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index 4effea5..c474018 100644

                class Templates(unittest.TestCase):
             # Inheritance from local context with variable parent template
             'inheritance25': ("{% extends context_template.1 %}{% block first %}2{% endblock %}{% block second %}4{% endblock %}", {'context_template': [template.Template("Wrong"), template.Template("1{% block first %}_{% endblock %}3{% block second %}_{% endblock %}")]}, '1234'),
+            # Template with no tags
+            'inheritance26': ("no tags", {}, 'no tags'),
+            # Inheritance from a template without tags
+            'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no tags'),
             ### I18N ##################################################################
             # {% spaceless %} tag