Skip to content

Commit 773b6bd

Browse files
committed
fix percent escape && add test
1 parent dc66614 commit 773b6bd

3 files changed

Lines changed: 42 additions & 2 deletions

File tree

‎mako/lexer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,12 @@ def match_text(self):
357357
r"""
358358
(.*?) # anything, followed by:
359359
(
360-
(?<=\n)(?=[ \t]*(?=%|\#\#)) # an eval or line-based
360+
((?<=\n)|^)(?=[ \t]*(?=%|\#\#)) # an eval or line-based
361361
# comment preceded by a
362362
# consumed newline and whitespace
363363
|
364+
(?<!%)(?=%%+)
365+
|
364366
(?=\${) # an expression
365367
|
366368
(?=</?[%&]) # a substitution or block or call start or end

‎test/test_lexer.py‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,35 @@ def test_percent_escape(self):
202202
[
203203
Text("""\n\n""", (1, 1)),
204204
Text("""% some whatever.\n\n""", (3, 2)),
205-
Text(" %% more some whatever\n", (5, 2)),
205+
Text(" ", (5, 2)),
206+
Text("% more some whatever\n", (5, 6)),
206207
ControlLine("if", "if foo:", False, (6, 1)),
207208
ControlLine("if", "endif", True, (7, 1)),
208209
Text(" ", (8, 1)),
209210
],
210211
),
211212
)
212213

214+
def test_percent_escape2(self):
215+
template = """%% do something
216+
%%% do something
217+
if <some condition>:
218+
%%%% do something
219+
"""
220+
node = Lexer(template).parse()
221+
self._compare(
222+
node,
223+
TemplateNode(
224+
{},
225+
[
226+
Text("% do something\n", (1, 2)),
227+
Text("%% do something\nif <some condition>:\n", (2, 2)),
228+
Text(" ", (4, 2)),
229+
Text("%%% do something\n ", (4, 6)),
230+
],
231+
),
232+
)
233+
213234
def test_old_multiline_comment(self):
214235
template = """#*"""
215236
node = Lexer(template).parse()

‎test/test_template.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,3 +1667,20 @@ class FuturesTest(TemplateTest):
16671667
def test_future_import(self):
16681668
t = Template("${ x / y }", future_imports=["division"])
16691669
assert result_lines(t.render(x=12, y=5)) == ["2.4"]
1670+
1671+
1672+
class EscapeTest(TemplateTest):
1673+
def test_percent_escape(self):
1674+
t = Template(
1675+
"""%% do something
1676+
%%% do something
1677+
if <some condition>:
1678+
%%%% do something
1679+
"""
1680+
)
1681+
assert result_lines(t.render()) == [
1682+
"% do something",
1683+
"%% do something",
1684+
"if <some condition>:",
1685+
"%%% do something",
1686+
]

0 commit comments

Comments
 (0)