From df0eb38a68a0fe1d93eab2d57ac7a8dd19cbf16d Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sat, 17 Feb 2024 23:38:59 +0100 Subject: [PATCH] _helpers: generalise regular expression in find_opt --- scripts/_helpers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_helpers.py b/scripts/_helpers.py index ed60fb5b..d30f205c 100644 --- a/scripts/_helpers.py +++ b/scripts/_helpers.py @@ -4,11 +4,11 @@ # SPDX-License-Identifier: MIT import contextlib +import copy import hashlib import logging import os import re -import copy import urllib from functools import partial from pathlib import Path @@ -117,9 +117,9 @@ def find_opt(opts, expr): """ for o in opts: if expr in o: - m = re.findall("^m?\d*(\.|p)?\d+$", o) + m = re.findall(r"m?\d+(?:[\.p]\d+)?", o) if len(m) > 0: - return True, float(m[0].replace("p", ".").replace("m", "-")) + return True, float(m[-1].replace("p", ".").replace("m", "-")) else: return True, None return False, None