From 5ccd449c4c5be872de2a59330ddaac180b4dc696 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 14 Jan 2023 11:53:32 +0000 Subject: [PATCH] Import underlying parser functions as an underscored variable These functions are not a part of the public interface for the modules they're being imported into. --- src/packaging/markers.py | 11 +++++++++-- src/packaging/requirements.py | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/packaging/markers.py b/src/packaging/markers.py index 68369c98..8b98fca7 100644 --- a/src/packaging/markers.py +++ b/src/packaging/markers.py @@ -8,7 +8,14 @@ import sys from typing import Any, Callable, Dict, List, Optional, Tuple, Union -from ._parser import MarkerAtom, MarkerList, Op, Value, Variable, parse_marker +from ._parser import ( + MarkerAtom, + MarkerList, + Op, + Value, + Variable, + parse_marker as _parse_marker, +) from ._tokenizer import ParserSyntaxError from .specifiers import InvalidSpecifier, Specifier from .utils import canonicalize_name @@ -189,7 +196,7 @@ def __init__(self, marker: str) -> None: # packaging.requirements.Requirement. If any additional logic is # added here, make sure to mirror/adapt Requirement. try: - self._markers = _normalize_extra_values(parse_marker(marker)) + self._markers = _normalize_extra_values(_parse_marker(marker)) # The attribute `_markers` can be described in terms of a recursive type: # MarkerList = List[Union[Tuple[Node, ...], str, MarkerList]] # diff --git a/src/packaging/requirements.py b/src/packaging/requirements.py index a9f9b9c7..f34bfa85 100644 --- a/src/packaging/requirements.py +++ b/src/packaging/requirements.py @@ -5,7 +5,7 @@ import urllib.parse from typing import Any, List, Optional, Set -from ._parser import parse_requirement +from ._parser import parse_requirement as _parse_requirement from ._tokenizer import ParserSyntaxError from .markers import Marker, _normalize_extra_values from .specifiers import SpecifierSet @@ -32,7 +32,7 @@ class Requirement: def __init__(self, requirement_string: str) -> None: try: - parsed = parse_requirement(requirement_string) + parsed = _parse_requirement(requirement_string) except ParserSyntaxError as e: raise InvalidRequirement(str(e)) from e