Fixed #26402 -- Added relative path support in include/extends template tags.

tests/template_tests/relative_templates/dir1/dir2/inc1.html

@@ -0,0 +1 @@
+{% include "./../../three.html" %}

tests/template_tests/relative_templates/dir1/dir2/inc2.html

@@ -0,0 +1 @@
+{% include "./include_content.html" %}

tests/template_tests/relative_templates/dir1/dir2/include_content.html

@@ -0,0 +1 @@
+dir2 include

tests/template_tests/relative_templates/dir1/dir2/one.html

@@ -0,0 +1,3 @@
+{% extends "./../../one.html" %}
+
+{% block content %}{{ block.super }} dir2 one{% endblock %}

tests/template_tests/relative_templates/dir1/looped.html

@@ -0,0 +1,3 @@
+{% extends "./dir2/../looped.html" %}
+
+{% block content %}{{ block.super }} dir1 three{% endblock %}

tests/template_tests/relative_templates/dir1/one.html

@@ -0,0 +1,3 @@
+{% extends "./../one.html" %}
+
+{% block content %}{{ block.super }} dir1 one{% endblock %}

tests/template_tests/relative_templates/dir1/one1.html

@@ -0,0 +1,3 @@
+{% extends './../one.html' %}
+
+{% block content %}{{ block.super }} dir1 one{% endblock %}

tests/template_tests/relative_templates/dir1/one2.html

@@ -0,0 +1,3 @@
+{% extends '../one.html' %}
+
+{% block content %}{{ block.super }} dir1 one{% endblock %}

tests/template_tests/relative_templates/dir1/one3.html

@@ -0,0 +1,3 @@
+{% extends "../one.html" %}
+
+{% block content %}{{ block.super }} dir1 one{% endblock %}

tests/template_tests/relative_templates/dir1/three.html

@@ -0,0 +1,3 @@
+{% extends "./dir2/../../three.html" %}
+
+{% block content %}{{ block.super }} dir1 three{% endblock %}

tests/template_tests/relative_templates/dir1/two.html

@@ -0,0 +1,3 @@
+{% extends "./dir2/one.html" %}
+
+{% block content %}{{ block.super }} dir1 two{% endblock %}

tests/template_tests/relative_templates/error_extends.html

@@ -0,0 +1,3 @@
+{% extends "./../two.html" %}
+
+{% block content %}{{ block.super }} one{% endblock %}

tests/template_tests/relative_templates/error_include.html

@@ -0,0 +1 @@
+{% include "./../three.html" %}

tests/template_tests/relative_templates/one.html

@@ -0,0 +1,3 @@
+{% extends "./two.html" %}
+
+{% block content %}{{ block.super }} one{% endblock %}

tests/template_tests/relative_templates/three.html

@@ -0,0 +1 @@
+{% block content %}three{% endblock %}

tests/template_tests/relative_templates/two.html

@@ -0,0 +1,3 @@
+{% extends "./three.html" %}
+
+{% block content %}{{ block.super }} two{% endblock %}

tests/template_tests/test_extends_relative.py

@@ -0,0 +1,105 @@
+import os
+
+from django.template import Context, Engine, TemplateSyntaxError
+from django.test import SimpleTestCase
+
+from .utils import ROOT
+
+RELATIVE = os.path.join(ROOT, 'relative_templates')
+
+
+class ExtendsRelativeBehaviorTests(SimpleTestCase):
+
+    def test_normal_extend(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('one.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one')
+
+    def test_dir1_extend(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/one.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir1 one')
+
+    def test_dir1_extend1(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/one1.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir1 one')
+
+    def test_dir1_extend2(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/one2.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir1 one')
+
+    def test_dir1_extend3(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/one3.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir1 one')
+
+    def test_dir2_extend(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/dir2/one.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir2 one')
+
+    def test_extend_error(self):
+        engine = Engine(dirs=[RELATIVE])
+        msg = (
+            "The relative path '\"./../two.html\"' points outside the file "
+            "hierarchy that template 'error_extends.html' is in."
+        )
+        with self.assertRaisesMessage(TemplateSyntaxError, msg):
+            engine.render_to_string('error_extends.html')
+
+
+class IncludeRelativeBehaviorTests(SimpleTestCase):
+
+    def test_normal_include(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/dir2/inc2.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'dir2 include')
+
+    def test_dir2_include(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/dir2/inc1.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three')
+
+    def test_include_error(self):
+        engine = Engine(dirs=[RELATIVE])
+        msg = (
+            "The relative path '\"./../three.html\"' points outside the file "
+            "hierarchy that template 'error_include.html' is in."
+        )
+        with self.assertRaisesMessage(TemplateSyntaxError, msg):
+            engine.render_to_string('error_include.html')
+
+
+class ExtendsMixedBehaviorTests(SimpleTestCase):
+
+    def test_mixing1(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/two.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir2 one dir1 two')
+
+    def test_mixing2(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/three.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three dir1 three')
+
+    def test_mixing_loop(self):
+        engine = Engine(dirs=[RELATIVE])
+        msg = (
+            "The relative path '\"./dir2/../looped.html\"' was translated to "
+            "template name \'dir1/looped.html\', the same template in which "
+            "the tag appears."
+        )
+        with self.assertRaisesMessage(TemplateSyntaxError, msg):
+            engine.render_to_string('dir1/looped.html')