p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #15053 -- Clarified debug message when skipping templates to avoid recursion.

This commit is contained in:
Daniel Hahler 2019-04-26 20:06:18 +02:00 committed by Mariusz Felisiak
parent a1215a3237
commit c70cd2a926
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/loaders/base.py
View File

@ -17,7 +17,7 @@ class Loader:
for origin in self.get_template_sources(template_name): for origin in self.get_template_sources(template_name):
if skip is not None and origin in skip: if skip is not None and origin in skip:
tried.append((origin, 'Skipped')) tried.append((origin, 'Skipped to avoid recursion'))
continue continue
try: try:

7
tests/template_tests/test_extends.py
View File

@ -64,8 +64,13 @@ class ExtendsBehaviorTests(SimpleTestCase):
""" """
engine = Engine(dirs=[os.path.join(RECURSIVE, 'fs')]) engine = Engine(dirs=[os.path.join(RECURSIVE, 'fs')])
template = engine.get_template('self.html') template = engine.get_template('self.html')
with self.assertRaises(TemplateDoesNotExist): with self.assertRaises(TemplateDoesNotExist) as e:
template.render(Context({})) template.render(Context({}))
tried = e.exception.tried
self.assertEqual(len(tried), 1)
origin, message = tried[0]
self.assertEqual(origin.template_name, 'self.html')
self.assertEqual(message, 'Skipped to avoid recursion')
def test_extend_cached(self): def test_extend_cached(self):
engine = Engine( engine = Engine(