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.

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

Jump to bottom

Correctly handle trailing whitespace on URL requirements #642

Merged
merged 2 commits into from
Dec 14, 2022
Merged

Correctly handle trailing whitespace on URL requirements #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96cf41e
Correctly handle trailing whitespace on URL requirements
pradyunsg Dec 13, 2022
21026b3
Eliminate an unnecessary else clause
pradyunsg Dec 13, 2022
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
9 changes: 6 additions & 3 deletions src/packaging/_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def _parse_requirement_details(
tokenizer: Tokenizer,
) -> Tuple[str, str, Optional[MarkerList]]:
"""
requirement_details = AT URL (WS requirement_marker)?
requirement_details = AT URL (WS requirement_marker?)?
| specifier WS? (requirement_marker)?
"""

Expand All @@ -108,6 +108,10 @@ def _parse_requirement_details(

tokenizer.expect("WS", expected="whitespace after URL")

# The input might end after whitespace.
if tokenizer.check("END", peek=True):
return (url, specifier, marker)

marker = _parse_requirement_marker(
tokenizer, span_start=url_start, after="URL and whitespace"
)
Expand Down Expand Up @@ -144,8 +148,7 @@ def _parse_requirement_marker(
f"Expected end or semicolon (after {after})",
span_start=span_start,
)
else:
tokenizer.read()
tokenizer.read()

marker = _parse_marker(tokenizer)
tokenizer.consume("WS")
Expand Down
6 changes: 3 additions & 3 deletions tests/test_requirements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,14 +581,14 @@ def test_str_and_repr(
self, extras: str, url_or_specifier: str, marker: str
) -> None:
# GIVEN
to_parse = f"name{extras}{url_or_specifier}{marker}".strip()
to_parse = f"name{extras}{url_or_specifier}{marker}"

# WHEN
req = Requirement(to_parse)

# THEN
assert str(req) == to_parse
assert repr(req) == f"<Requirement({to_parse!r})>"
assert str(req) == to_parse.strip()
assert repr(req) == f"<Requirement({to_parse.strip()!r})>"

@pytest.mark.parametrize("dep1, dep2", EQUAL_DEPENDENCIES)
def test_equal_reqs_equal_hashes(self, dep1: str, dep2: str) -> None:
Expand Down