Split Specifier regex into operator and version parts

Tokenizer uses _version_regex_str to detect 'VERSION' token.
pypa · Jul 19, 2022 · 8137185 · 8137185
1 parent 9ab90ae
commit 8137185
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packaging/_parser.py b/packaging/_parser.py
@@ -20,7 +20,7 @@ def __init__(self, value: str) -> None:
         self.value = value
 
     def __str__(self) -> str:
-        return str(self.value)
+        return self.value
 
     def __repr__(self) -> str:
         return f"<{self.__class__.__name__}('{self}')>"

diff --git a/packaging/specifiers.py b/packaging/specifiers.py
@@ -80,8 +80,10 @@ def filter(
 
 class Specifier(BaseSpecifier):
 
-    _regex_str = r"""
+    _operator_regex_str = r"""
         (?P<operator>(~=|==|!=|<=|>=|<|>|===))
+        """
+    _version_regex_str = r"""
         (?P<version>
             (?:
                 # The identity operators allow for an escape hatch that will
@@ -173,7 +175,10 @@ class Specifier(BaseSpecifier):
         )
         """
 
-    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+    _regex = re.compile(
+        r"^\s*" + _operator_regex_str + _version_regex_str + r"\s*$",
+        re.VERBOSE | re.IGNORECASE,
+    )
 
     _operators = {
         "~=": "compatible",