From 69a671410851db3e9dbf9df5ae75b4e271aabcbe Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Tue, 14 Jul 2026 01:25:43 +0200 Subject: [PATCH] Use raw string notation to fix python compile warnings E.g.: SyntaxError: "\d" is an invalid escape sequence. Did you mean "\\d"? A raw string is also an option. --- .../profiles/default/scripts/image2disk.py | 6 +++--- .../profiles/default/scripts/image2disk.py | 6 +++--- confluent_server/confluent/log.py | 2 +- .../plugins/hardwaremanagement/enos.py | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/confluent_osdeploy/el7-diskless/profiles/default/scripts/image2disk.py b/confluent_osdeploy/el7-diskless/profiles/default/scripts/image2disk.py index 768aa57d..ec67bad0 100644 --- a/confluent_osdeploy/el7-diskless/profiles/default/scripts/image2disk.py +++ b/confluent_osdeploy/el7-diskless/profiles/default/scripts/image2disk.py @@ -173,8 +173,8 @@ def fixup(rootdir, vols): for vol in vols: if vol['mount'] == '/boot/efi': targdev = vol['targetdisk'] - partnum = re.search('(\d+)$', targdev).group(1) - targblock = re.search('(.*)\d+$', targdev).group(1) + partnum = re.search(r'(\d+)$', targdev).group(1) + targblock = re.search(r'(.*)\d+$', targdev).group(1) if targblock: if targblock.endswith('p') and 'nvme' in targblock: targblock = targblock[:-1] @@ -231,7 +231,7 @@ def install_to_disk(imgpath): deflvmsize += fs['initsize'] minlvmsize += fs['minsize'] else: - plainvols[int(re.search('(\d+)$', fs['device'])[0])] = fs + plainvols[int(re.search(r'(\d+)$', fs['device'])[0])] = fs with open('/tmp/installdisk') as diskin: instdisk = diskin.read() instdisk = '/dev/' + instdisk diff --git a/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py b/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py index 91afc5cb..91f0bd7f 100644 --- a/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py +++ b/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py @@ -204,8 +204,8 @@ def fixup(rootdir, vols): for vol in vols: if vol['mount'] == '/boot/efi': targdev = vol['targetdisk'] - partnum = re.search('(\d+)$', targdev).group(1) - targblock = re.search('(.*)\d+$', targdev).group(1) + partnum = re.search(r'(\d+)$', targdev).group(1) + targblock = re.search(r'(.*)\d+$', targdev).group(1) if targblock: if targblock.endswith('p') and 'nvme' in targblock: targblock = targblock[:-1] @@ -263,7 +263,7 @@ def install_to_disk(imgpath): deflvmsize += fs['initsize'] minlvmsize += fs['minsize'] else: - plainvols[int(re.search('(\d+)$', fs['device'])[0])] = fs + plainvols[int(re.search(r'(\d+)$', fs['device'])[0])] = fs with open('/tmp/installdisk') as diskin: instdisk = diskin.read() instdisk = '/dev/' + instdisk diff --git a/confluent_server/confluent/log.py b/confluent_server/confluent/log.py index 9ebd2a2e..b29959ef 100644 --- a/confluent_server/confluent/log.py +++ b/confluent_server/confluent/log.py @@ -399,7 +399,7 @@ class TimedAndSizeRotatingFileHandler(BaseRotatingHandler): prefix = baseName + "." if dirName not in self.dirContents or self.dirContents[dirName][1] < time.time(): self.dirContents[dirName] = (os.listdir(dirName), time.time() + 5) - matchexp = re.compile(f'^{prefix}\.\d+$') + matchexp = re.compile(rf'^{prefix}\.\d+$') fileNames = [f for f in self.dirContents[dirName][0] if matchexp.match(f)] plen = len(prefix) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/enos.py b/confluent_server/confluent/plugins/hardwaremanagement/enos.py index 18f92390..4f0d5167 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/enos.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/enos.py @@ -154,12 +154,12 @@ def gather_data(configmanager, creds, node): nssh = enos_login(node=node, configmanager=configmanager, creds=creds) switch_lines = enos_version(ssh=nssh) switch_data = {} - sysinfo = {"Product name": {"regex": ".*RackSwitch (\w+)"}, - "Serial Number": {"regex": "ESN\s*\w*\s*: ([\w-]+)"}, - "Board Serial Number": {"regex": "Switch Serial No: (\w+)"}, - "Model": {"regex": "MTM\s*\w*\s*: ([\w-]+)"}, - "FRU Number": {"regex": "Hardware Part\s*\w*\s*: (\w+)"}, - "Airflow": {"regex": "System Fan Airflow\s*\w*\s*: ([\w-]+)"}, + sysinfo = {"Product name": {"regex": r".*RackSwitch (\w+)"}, + "Serial Number": {"regex": r"ESN\s*\w*\s*: ([\w-]+)"}, + "Board Serial Number": {"regex": r"Switch Serial No: (\w+)"}, + "Model": {"regex": r"MTM\s*\w*\s*: ([\w-]+)"}, + "FRU Number": {"regex": r"Hardware Part\s*\w*\s*: (\w+)"}, + "Airflow": {"regex": r"System Fan Airflow\s*\w*\s*: ([\w-]+)"}, } invinfo = { @@ -235,7 +235,7 @@ def gather_data(configmanager, creds, node): sysfw = {"Software Version": "Unknown", "Boot kernel": "Unknown"} for line in switch_lines: for key in sysfw.keys(): - regex = f"{key}\s*\w*\s* ([0-9.]+)" + regex = rf"{key}\s*\w*\s* ([0-9.]+)" match = re.match(re.compile(regex), line) if match: sysfw[key] = match.group(1) @@ -252,7 +252,7 @@ def gather_psus(data): # others are: # Internal Power Supply: On if "Power Supply" in line: - match = re.match(re.compile(f"Power Supply (\d)+.*"), line) + match = re.match(re.compile(r"Power Supply (\d)+.*"), line) if match: psu = match.group(1) if psu not in psus: @@ -282,7 +282,7 @@ def gather_fans(data): for line in data: # look for presence of fans if "Fan" in line: - match = re.match(re.compile(f"Fan (\d)+.*"), line) + match = re.match(re.compile(r"Fan (\d)+.*"), line) if match: fan = match.group(1) if match: