From 7ebad30c2f00bf7aea582a47a6b27848552f055d Mon Sep 17 00:00:00 2001 From: jesopo Date: Wed, 26 Feb 2020 13:26:06 +0000 Subject: [PATCH] convert & in sed to \g<0> so python handles full-match replacements --- src/utils/parse/sed.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/utils/parse/sed.py b/src/utils/parse/sed.py index 75d24be4..76b9e567 100644 --- a/src/utils/parse/sed.py +++ b/src/utils/parse/sed.py @@ -26,16 +26,10 @@ class SedReplace(Sed): count: int def match(self, s): - matches = list(self.pattern.finditer(s)) - if not self.count == 0: - matches = matches[:self.count] - - for match in matches: - replace_copy = self.replace - for token in reversed(_tokens(replace_copy, "&")): - replace_copy = ( - replace_copy[:token]+match.group(0)+replace_copy[token+1:]) - s = re.sub(self.pattern, replace_copy, s, 1) + replace_copy = self.replace + for token in reversed(_tokens(replace_copy, "&")): + replace_copy = replace_copy[:token]+r"\g<0>"+replace_copy[token+1:] + s = re.sub(self.pattern, replace_copy, s, self.count) return s @dataclasses.dataclass