From fd4afa128482697fa715ec134e623117d05f71a0 Mon Sep 17 00:00:00 2001 From: Alina Lenk Date: Thu, 11 Apr 2024 15:47:37 +0200 Subject: [PATCH] generate_packets.py: Mark regexes as raw strings to fix invalid escape sequences Reported by Marko Lindqvist See RM #365 Signed-off-by: Alina Lenk --- common/generate_packets.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/common/generate_packets.py b/common/generate_packets.py index 1ba522e962..4426ba4d48 100755 --- a/common/generate_packets.py +++ b/common/generate_packets.py @@ -116,12 +116,12 @@ def parse_fields(str, types): break typeinfo={} - mo=re.search("^(.*)\((.*)\)$",type) + mo = re.search(r"^(.*)\((.*)\)$", type) assert mo,repr(type) typeinfo["dataio_type"],typeinfo["struct_type"]=mo.groups() if typeinfo["struct_type"]=="float": - mo=re.search("^(\D+)(\d+)$",typeinfo["dataio_type"]) + mo = re.search(r"^(\D+)(\d+)$", typeinfo["dataio_type"]) assert mo typeinfo["dataio_type"]=mo.group(1) typeinfo["float_factor"]=int(mo.group(2)) @@ -171,11 +171,11 @@ def parse_fields(str, types): removes=[] remaining=[] for i in arr: - mo=re.search("^add-cap\((.*)\)$",i) + mo = re.search(r"^add-cap\((.*)\)$", i) if mo: adds.append(mo.group(1)) continue - mo=re.search("^remove-cap\((.*)\)$",i) + mo = re.search(r"^remove-cap\((.*)\)$", i) if mo: removes.append(mo.group(1)) continue @@ -1338,7 +1338,7 @@ class Packet: str=str.strip() lines=str.split("\n") - mo=re.search("^\s*(\S+)\s*=\s*(\d+)\s*;\s*(.*?)\s*$",lines[0]) + mo = re.search(r"^\s*(\S+)\s*=\s*(\d+)\s*;\s*(.*?)\s*$", lines[0]) assert mo,repr(lines[0]) self.type=mo.group(1) @@ -1409,7 +1409,7 @@ class Packet: removes=[] remaining=[] for i in arr: - mo=re.search("^cancel\((.*)\)$",i) + mo = re.search(r"^cancel\((.*)\)$", i) if mo: self.cancel.append(mo.group(1)) continue @@ -1919,13 +1919,13 @@ def main(): content=open(input_name).read() content=strip_c_comment(content) lines=content.split("\n") - lines=map(lambda x: re.sub("\s*#.*$","",x),lines) - lines=map(lambda x: re.sub("\s*//.*$","",x),lines) - lines=filter(lambda x:not re.search("^\s*$",x),lines) + lines = map(lambda x: re.sub(r"\s*#.*$", "", x), lines) + lines = map(lambda x: re.sub(r"\s*//.*$", "", x), lines) + lines = filter(lambda x: not re.search(r"^\s*$", x), lines) lines2=[] types=[] for i in lines: - mo=re.search("^type\s+(\S+)\s*=\s*(.+)\s*$",i) + mo = re.search(r"^type\s+(\S+)\s*=\s*(.+)\s*$", i) if mo: types.append(Type(mo.group(1),mo.group(2))) else: -- 2.34.1