Simplified types

tomschr · tomschr · commit 3f2078466529 · 2023-07-24T10:04:11.000+02:00
* Remove unused Int_or_Str type
* Reuse String in SpecComparable
diff --git a/src/semver/spec.py b/src/semver/spec.py
@@ -15,8 +15,6 @@
 from .version import Version
 from ._types import String
 
-Int_or_Str = Union[int, str]
-
 
 class InvalidSpecifier(ValueError):
     """
@@ -31,7 +29,7 @@ class InvalidSpecifier(ValueError):
 
 
 # These types are required here because of circular imports
-SpecComparable = Union[Version, str, bytes, dict, tuple, list]
+SpecComparable = Union[Version, String, dict, tuple, list]
 SpecComparator = Callable[["Spec", SpecComparable], bool]
 
 
@@ -273,6 +271,8 @@ def spec(self) -> str:
         '>=1.2.3'
         >>> Spec(">=1.2.x").spec
         '>=1.2.*'
+        >>> Spec("2.1.4").spec
+        '==2.1.4'
         """
         return f"{self._operator}{self._realversion}"
 
diff --git a/src/semver/versionregex.py b/src/semver/versionregex.py
@@ -1,7 +1,7 @@
 """Defines basic regex constants."""
 
 import re
-from typing import ClassVar, Pattern
+from typing import ClassVar, Pattern, Tuple
 
 
 class VersionRegex:
@@ -18,7 +18,7 @@ class VersionRegex:
     _LAST_NUMBER: ClassVar[Pattern[str]]  = re.compile(r"(?:[^\d]*(\d+)[^\d]*)+")
 
     #: The names of the different parts of a version
-    NAMES = ("major", "minor", "patch", "prerelease", "build")
+    NAMES: ClassVar[Tuple[str, ...]] = ("major", "minor", "patch", "prerelease", "build")
 
     #: The regex of the major part of a version:
     MAJOR: ClassVar[str] = rf"(?P<major>{_RE_NUMBER})"
