From cfda1fa3f8d95f0f4a369da9021dbd770e5fa44a Mon Sep 17 00:00:00 2001 From: Preston Timmons Date: Thu, 14 Jan 2016 20:36:05 -0600 Subject: Fixed #25848 -- Set template origin on each node. Prior to 55f12f8709, the template origin was available on each node via `self.token.source[0]`. This behavior was removed when debug handling was simplified, but 3rd-party debugging tools still depend on its presence. This updates the Parser to set origin on individual nodes. This enables the source template to be determined even when template extending or including is used. --- tests/template_tests/tests.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tests/template_tests') diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py index 43cc182008..ff0b29073f 100644 --- a/tests/template_tests/tests.py +++ b/tests/template_tests/tests.py @@ -140,3 +140,12 @@ class TemplateTests(SimpleTestCase): child = engine.from_string( '{% extends parent %}{% block content %}child{% endblock %}') self.assertEqual(child.render(Context({'parent': parent})), 'child') + + def test_node_origin(self): + """ + #25848 -- Set origin on Node so debugging tools can determine which + template the node came from even if extending or including templates. + """ + template = Engine().from_string('content') + for node in template.nodelist: + self.assertEqual(node.origin, template.origin) -- cgit v1.3