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

Fixed #26573 -- Added descriptive error message for malformed if/else/elif template tags.

This commit is contained in:
inondle 2016-05-27 15:12:56 -07:00 committed by Tim Graham
parent ff6c6feae1
commit 93c312cc9c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/template/defaulttags.py
View File

@ -969,7 +969,8 @@ def do_if(parser, token):
token = parser.next_token() token = parser.next_token()
# {% endif %} # {% endif %}
assert token.contents == 'endif' if token.contents != 'endif':
raise TemplateSyntaxError('Malformed template tag at line {0}: "{1}"'.format(token.lineno, token.contents))
return IfNode(conditions_nodelists) return IfNode(conditions_nodelists)

6
tests/template_tests/syntax_tests/test_if.py
View File

@ -508,6 +508,12 @@ class IfTagTests(SimpleTestCase):
with self.assertRaises(TemplateSyntaxError): with self.assertRaises(TemplateSyntaxError):
self.engine.get_template('if-tag-error12') self.engine.get_template('if-tag-error12')
@setup({'else-if-tag-error01': '{% if foo is bar %} yes {% else if foo is not bar %} no {% endif %}'})
def test_else_if_tag_error01(self):
error_message = 'Malformed template tag at line 1: "else if foo is not bar"'
with self.assertRaisesMessage(TemplateSyntaxError, error_message):
self.engine.get_template('else-if-tag-error01')
@setup({'if-tag-shortcircuit01': '{% if x.is_true or x.is_bad %}yes{% else %}no{% endif %}'}) @setup({'if-tag-shortcircuit01': '{% if x.is_true or x.is_bad %}yes{% else %}no{% endif %}'})
def test_if_tag_shortcircuit01(self): def test_if_tag_shortcircuit01(self):
""" """