Skip to content
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.

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

parse_marker should consume the entire source string #687

Merged
merged 1 commit into from Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Expand Up @@ -4,7 +4,7 @@ Changelog
*unreleased*
~~~~~~~~~~~~

No unreleased changes.
* Enforce that the entire marker string is parsed (:issue:`687`)

23.1 - 2023-04-12
~~~~~~~~~~~~~~~~~
Expand Down
8 changes: 7 additions & 1 deletion src/packaging/_parser.py
Expand Up @@ -252,7 +252,13 @@ def _parse_version_many(tokenizer: Tokenizer) -> str:
# Recursive descent parser for marker expression
# --------------------------------------------------------------------------------------
def parse_marker(source: str) -> MarkerList:
return _parse_marker(Tokenizer(source, rules=DEFAULT_RULES))
return _parse_full_marker(Tokenizer(source, rules=DEFAULT_RULES))


def _parse_full_marker(tokenizer: Tokenizer) -> MarkerList:
retval = _parse_marker(tokenizer)
tokenizer.expect("END", expected="end of marker expression")
return retval


def _parse_marker(tokenizer: Tokenizer) -> MarkerList:
Expand Down
1 change: 1 addition & 0 deletions tests/test_markers.py
Expand Up @@ -167,6 +167,7 @@ def test_parses_valid(self, marker_string):
"(python_version)",
"python_version >= 1.0 and (python_version)",
'(python_version == "2.7" and os_name == "linux"',
'(python_version == "2.7") with random text',
],
)
def test_parses_invalid(self, marker_string):
Expand Down