From 8af75ac7976707c81acf36a8d6b805bc5e9ba3a5 Mon Sep 17 00:00:00 2001 From: zariiii9003 <52598363+zariiii9003@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:57:17 +0200 Subject: [PATCH] fix regex in _parse_additional_config() --- can/logger.py | 2 +- test/test_logger.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/can/logger.py b/can/logger.py index 35c3db20b..81e9527f0 100644 --- a/can/logger.py +++ b/can/logger.py @@ -145,7 +145,7 @@ def __call__( def _parse_additional_config(unknown_args: Sequence[str]) -> TAdditionalCliArgs: for arg in unknown_args: - if not re.match(r"^--[a-zA-Z\-]*?=\S*?$", arg): + if not re.match(r"^--[a-zA-Z][a-zA-Z0-9\-]*=\S*?$", arg): raise ValueError(f"Parsing argument {arg} failed") def _split_arg(_arg: str) -> Tuple[str, str]: diff --git a/test/test_logger.py b/test/test_logger.py index 32fc987b4..10df2557b 100644 --- a/test/test_logger.py +++ b/test/test_logger.py @@ -146,6 +146,7 @@ def test_parse_additional_config(self): "--receive-own-messages=True", "--false-boolean=False", "--offset=1.5", + "--tseg1-abr=127", ] parsed_args = can.logger._parse_additional_config(unknown_args) @@ -170,6 +171,9 @@ def test_parse_additional_config(self): assert "offset" in parsed_args assert parsed_args["offset"] == 1.5 + assert "tseg1_abr" in parsed_args + assert parsed_args["tseg1_abr"] == 127 + with pytest.raises(ValueError): can.logger._parse_additional_config(["--wrong-format"])