Skip to content

Commit b41326d

Browse files
committed
Rename marker_expr to marker
This is better aligned with the naming from PEP 508.
1 parent 975cd32 commit b41326d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

packaging/_parser.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def _parse_requirement_marker(
147147
else:
148148
tokenizer.read()
149149

150-
marker = _parse_marker_expr(tokenizer)
150+
marker = _parse_marker(tokenizer)
151151
tokenizer.consume("WS")
152152

153153
return marker
@@ -234,12 +234,12 @@ def _parse_version_many(tokenizer: Tokenizer) -> str:
234234
# Recursive descent parser for marker expression
235235
# --------------------------------------------------------------------------------------
236236
def parse_marker(source: str) -> MarkerList:
237-
return _parse_marker_expr(Tokenizer(source, rules=DEFAULT_RULES))
237+
return _parse_marker(Tokenizer(source, rules=DEFAULT_RULES))
238238

239239

240-
def _parse_marker_expr(tokenizer: Tokenizer) -> MarkerList:
240+
def _parse_marker(tokenizer: Tokenizer) -> MarkerList:
241241
"""
242-
marker_expr = marker_atom (BOOLOP marker_atom)+
242+
marker = marker_atom (BOOLOP marker_atom)+
243243
"""
244244
expression = [_parse_marker_atom(tokenizer)]
245245
while tokenizer.check("BOOLOP"):
@@ -251,15 +251,15 @@ def _parse_marker_expr(tokenizer: Tokenizer) -> MarkerList:
251251

252252
def _parse_marker_atom(tokenizer: Tokenizer) -> MarkerAtom:
253253
"""
254-
marker_atom = WS? LEFT_PARENTHESIS WS? marker_expr WS? RIGHT_PARENTHESIS WS?
254+
marker_atom = WS? LEFT_PARENTHESIS WS? marker WS? RIGHT_PARENTHESIS WS?
255255
| WS? marker_item WS?
256256
"""
257257

258258
tokenizer.consume("WS")
259259
if tokenizer.check("LEFT_PARENTHESIS", peek=True):
260260
with tokenizer.enclosing_tokens("LEFT_PARENTHESIS", "RIGHT_PARENTHESIS"):
261261
tokenizer.consume("WS")
262-
marker: MarkerAtom = _parse_marker_expr(tokenizer)
262+
marker: MarkerAtom = _parse_marker(tokenizer)
263263
tokenizer.consume("WS")
264264
else:
265265
marker = _parse_marker_item(tokenizer)

0 commit comments

Comments
 (0)