Skip to content

Commit 7c2713c

Browse files
committed
Changed Missing to No Matching in error messages
1 parent b908f6c commit 7c2713c

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

adafruit_templateengine.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ def _resolve_includes_blocks_and_extends(template: str):
324324

325325
if endblock_match is None:
326326
raise TemplateSyntaxError(
327-
"Missing {% endblock %}",
327+
"No matching {% endblock %}",
328328
Token(
329329
template,
330330
offset + block_match.start(),
@@ -554,7 +554,7 @@ def _create_template_rendering_function( # pylint: disable=,too-many-locals,too
554554
nested_if_statements.append(token)
555555
elif token.content.startswith(r"{% elif "):
556556
if not nested_if_statements:
557-
raise TemplateSyntaxError("Missing {% if ... %}", token)
557+
raise TemplateSyntaxError("No matching {% if ... %}", token)
558558

559559
indentation_level -= 1
560560
function_string += (
@@ -563,14 +563,14 @@ def _create_template_rendering_function( # pylint: disable=,too-many-locals,too
563563
indentation_level += 1
564564
elif token.content == r"{% else %}":
565565
if not nested_if_statements:
566-
raise TemplateSyntaxError("Missing {% if ... %}", token)
566+
raise TemplateSyntaxError("No matching {% if ... %}", token)
567567

568568
indentation_level -= 1
569569
function_string += indent * indentation_level + "else:\n"
570570
indentation_level += 1
571571
elif token.content == r"{% endif %}":
572572
if not nested_if_statements:
573-
raise TemplateSyntaxError("Missing {% if ... %}", token)
573+
raise TemplateSyntaxError("No matching {% if ... %}", token)
574574

575575
indentation_level -= 1
576576
nested_if_statements.pop()
@@ -585,7 +585,7 @@ def _create_template_rendering_function( # pylint: disable=,too-many-locals,too
585585
nested_for_loops.append(token)
586586
elif token.content == r"{% empty %}":
587587
if not nested_for_loops:
588-
raise TemplateSyntaxError("Missing {% for ... %}", token)
588+
raise TemplateSyntaxError("No matching {% for ... %}", token)
589589

590590
indentation_level -= 1
591591
last_forloop_iterable = (
@@ -597,7 +597,7 @@ def _create_template_rendering_function( # pylint: disable=,too-many-locals,too
597597
indentation_level += 1
598598
elif token.content == r"{% endfor %}":
599599
if not nested_for_loops:
600-
raise TemplateSyntaxError("Missing {% for ... %}", token)
600+
raise TemplateSyntaxError("No matching {% for ... %}", token)
601601

602602
indentation_level -= 1
603603
nested_for_loops.pop()
@@ -612,7 +612,7 @@ def _create_template_rendering_function( # pylint: disable=,too-many-locals,too
612612
nested_while_loops.append(token)
613613
elif token.content == r"{% endwhile %}":
614614
if not nested_while_loops:
615-
raise TemplateSyntaxError("Missing {% while ... %}", token)
615+
raise TemplateSyntaxError("No matching {% while ... %}", token)
616616

617617
indentation_level -= 1
618618
nested_while_loops.pop()
@@ -622,7 +622,7 @@ def _create_template_rendering_function( # pylint: disable=,too-many-locals,too
622622
expression = token.content[8:-3]
623623
function_string += indent * indentation_level + f"{expression}\n"
624624

625-
# Token is autoescape mode change
625+
# Token is a autoescape mode change
626626
elif token.content.startswith(r"{% autoescape "):
627627
mode = token.content[14:-3]
628628
if mode not in ("on", "off"):
@@ -632,31 +632,31 @@ def _create_template_rendering_function( # pylint: disable=,too-many-locals,too
632632

633633
elif token.content == r"{% endautoescape %}":
634634
if not nested_autoescape_modes:
635-
raise TemplateSyntaxError("Missing {% autoescape ... %}", token)
635+
raise TemplateSyntaxError("No matching {% autoescape ... %}", token)
636636

637637
nested_autoescape_modes.pop()
638638

639639
else:
640-
raise TemplateSyntaxError(f"Unknown token type: {token.content}", token)
640+
raise TemplateSyntaxError(f"Unknown token: {token.content}", token)
641641

642642
else:
643-
raise TemplateSyntaxError(f"Unknown token type: {token.content}", token)
643+
raise TemplateSyntaxError(f"Unknown token: {token.content}", token)
644644

645645
# Move offset to the end of the token
646646
offset += token_match.end()
647647

648648
# Checking for unclosed blocks
649649
if len(nested_if_statements) > 0:
650650
last_if_statement = nested_if_statements[-1]
651-
raise TemplateSyntaxError("Missing {% endif %}", last_if_statement)
651+
raise TemplateSyntaxError("No matching {% endif %}", last_if_statement)
652652

653653
if len(nested_for_loops) > 0:
654654
last_for_loop = nested_for_loops[-1]
655-
raise TemplateSyntaxError("Missing {% endfor %}", last_for_loop)
655+
raise TemplateSyntaxError("No matching {% endfor %}", last_for_loop)
656656

657657
if len(nested_while_loops) > 0:
658658
last_while_loop = nested_while_loops[-1]
659-
raise TemplateSyntaxError("Missing {% endwhile %}", last_while_loop)
659+
raise TemplateSyntaxError("No matching {% endwhile %}", last_while_loop)
660660

661661
# No check for unclosed autoescape blocks, as they are optional and do not result in errors
662662

0 commit comments

Comments
 (0)