p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #25423 -- Made error message for unknown template tag more helpful.

This commit is contained in:
Pindi Albert 2015-10-04 10:50:18 -07:00 committed by Tim Graham
parent 2875325889
commit 9f2881deb1
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/template/base.py
View File

@ -553,13 +553,18 @@ class Parser(object):
if parse_until: if parse_until:
raise self.error( raise self.error(
token, token,
"Invalid block tag on line %d: '%s', expected %s" % ( "Invalid block tag on line %d: '%s', expected %s. Did you "
"forget to register or load this tag?" % (
token.lineno, token.lineno,
command, command,
get_text_list(["'%s'" % p for p in parse_until]), get_text_list(["'%s'" % p for p in parse_until]),
), ),
) )
raise self.error(token, "Invalid block tag on line %d: '%s'" % (token.lineno, command)) raise self.error(
token,
"Invalid block tag on line %d: '%s'. Did you forget to register "
"or load this tag?" % (token.lineno, command)
)
def unclosed_block_tag(self, parse_until): def unclosed_block_tag(self, parse_until):
command, token = self.command_stack.pop() command, token = self.command_stack.pop()

17
tests/template_tests/tests.py
View File

@ -68,14 +68,21 @@ class TemplateTests(SimpleTestCase):
#7876 -- Error messages should include the unexpected block name. #7876 -- Error messages should include the unexpected block name.
""" """
engine = Engine() engine = Engine()
msg = (
with self.assertRaises(TemplateSyntaxError) as e: "Invalid block tag on line 1: 'endblock', expected 'elif', 'else' "
"or 'endif'. Did you forget to register or load this tag?"
)
with self.assertRaisesMessage(TemplateSyntaxError, msg):
engine.from_string("{% if 1 %}lala{% endblock %}{% endif %}") engine.from_string("{% if 1 %}lala{% endblock %}{% endif %}")
self.assertEqual( def test_unknown_block_tag(self):
e.exception.args[0], engine = Engine()
"Invalid block tag on line 1: 'endblock', expected 'elif', 'else' or 'endif'", msg = (
"Invalid block tag on line 1: 'foobar'. Did you forget to "
"register or load this tag?"
) )
with self.assertRaisesMessage(TemplateSyntaxError, msg):
engine.from_string("lala{% foobar %}")
def test_compile_filter_expression_error(self): def test_compile_filter_expression_error(self):
""" """