technofab/bumpver
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/bumpver.git synced 2025-12-13 15:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: escaping in patterns

Browse source
This commit is contained in:
Manuel Barkhau 2018-12-20 15:28:11 +01:00
parent 65446440f7
commit 70c2b27157
4 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/pycalver/parse.py
View file

@ -21,8 +21,12 @@ PATTERN_ESCAPES = [
("." , "\u005c."),
("+" , "\u005c+"),
("*" , "\u005c*"),
("{" , "\u005c{{"),
("}" , "\u005c}}"),
("[" , "\u005c["),
("]" , "\u005c]"),
("(" , "\u005c("),
(")" , "\u005c)"),
]
# NOTE (mb 2018-09-03): These are matchers for parts, which are
@ -54,17 +58,25 @@ class PatternMatch(typ.NamedTuple):
PatternMatches = typ.Iterable[PatternMatch]
def _iter_for_pattern(lines: typ.List[str], pattern: str) -> PatternMatches:
# The pattern is escaped, so that everything besides the format
# string variables is treated literally.
def compile_pattern(pattern: str) -> typ.Pattern[str] :
pattern_tmpl = pattern
for char, escaped in PATTERN_ESCAPES:
pattern_tmpl = pattern_tmpl.replace(char, escaped)
# undo escaping only for valid part names
for part_name in RE_PATTERN_PARTS.keys():
pattern_tmpl = pattern_tmpl.replace("\u005c{{" + part_name + "\u005c}}", "{" + part_name + "}")
pattern_str = pattern_tmpl.format(**RE_PATTERN_PARTS)
pattern_re = re.compile(pattern_str)
return re.compile(pattern_str)
def _iter_for_pattern(lines: typ.List[str], pattern: str) -> PatternMatches:
# The pattern is escaped, so that everything besides the format
# string variables is treated literally.
pattern_re = compile_pattern(pattern)
for lineno, line in enumerate(lines):
match = pattern_re.search(line)
if match: