Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion cssselect/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -929,13 +929,29 @@ def _parse_series_integer(s: str) -> int:
return int(s)


# The B of An+B with whitespace: only around a sign that is a token of its
# own, as in "2n + 1" or "2n- 1".
_match_series_spaced_b = re.compile(" ?[+-] ?[0-9]+").fullmatch


def parse_series(tokens: Iterable[Token]) -> tuple[int, int]:
"""Parses the arguments for :nth-child() and friends."""
parts = []
end = None
for token in tokens:
if token.type == "STRING":
raise ValueError("String tokens not allowed in series.")
value = cast("str", token.value)
if end is not None and token.pos != end:
# Whitespace or a comment between two tokens, which must not
# join them: "1 2" is not "12". An escaped identifier is longer
# in the source than its value, but whitespace is allowed after
# the identifier that ends An anyway.
parts.append(" ")
parts.append(value)
end = token.pos + len(value)
# The An+B microsyntax is ASCII-case-insensitive: 2N+1, EVEN, Odd...
s = ascii_lower("".join(cast("str", token.value) for token in tokens).strip())
s = ascii_lower("".join(parts).strip())
if s == "odd":
return 2, 1
if s == "even":
Expand All @@ -953,6 +969,10 @@ def parse_series(tokens: Iterable[Token]) -> tuple[int, int]:
a_as_int = int(a + "1")
else:
a_as_int = _parse_series_integer(a)
if " " in b:
if not _match_series_spaced_b(b):
raise ValueError(f"Invalid integer in series: {b!r}")
b = b.replace(" ", "")
b_as_int = _parse_series_integer(b) if b else 0
return a_as_int, b_as_int

Expand Down
11 changes: 11 additions & 0 deletions tests/test_cssselect.py
Original file line number Diff line number Diff line change
Expand Up @@ -1357,6 +1357,17 @@ def series(css: str) -> tuple[int, int] | None:
assert series("\u0662n+1") is None
assert series("1_0") is None
assert series("2n+1_0") is None
# Whitespace only around the sign of B, never inside a number.
assert series("-n- 3") == (-1, -3)
assert series("2\\6e +1") == (2, 1)
assert series("1 2") is None
assert series("+ 5") is None
assert series("2 n") is None
assert series("+ n+3") is None
assert series("- n+3") is None
assert series("2n 1") is None
assert series("2n + 1 0") is None
assert series("2n+1/**/0") is None

def test_lang(self) -> None:
document = etree.fromstring(XMLLANG_IDS)
Expand Down
Loading