Skip to content

Fix regex in _parse_additional_config() #1868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Fix regex in _parse_additional_config() #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion can/logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]:
Expand Down
4 changes: 4 additions & 0 deletions test/test_logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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"])

Expand Down
Loading