Commit 93c312cc authored by inondle's avatar inondle Committed by Tim Graham
Browse files

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

parent ff6c6fea

django/template/defaulttags.py

+2 −1
Original line number Diff line number Diff line
@@ -969,7 +969,8 @@ def do_if(parser, token): 
        token = parser.next_token()



    # {% 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)

tests/template_tests/syntax_tests/test_if.py

+6 −0
Original line number Diff line number Diff line
@@ -508,6 +508,12 @@ class IfTagTests(SimpleTestCase): 
        with self.assertRaises(TemplateSyntaxError):

            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 %}'})

    def test_if_tag_shortcircuit01(self):

        """