more type annotations

Author: orsinium

dephell_specifier/git_specifier.py

@@ -2,7 +2,7 @@
 
 
 class GitSpecifier:
-    def __contains__(self, release):
+    def __contains__(self, release: object) -> bool:
         # check that this is GitRelease without imports
         return hasattr(release, 'commit')
 

dephell_specifier/range_specifier.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import re
+from typing import Iterable
 
 from packaging.specifiers import InvalidSpecifier
 from packaging.version import Version, parse
@@ -16,8 +17,9 @@
 
 class RangeSpecifier:
     _specs: set
+    join_type: JoinTypes
 
-    def __init__(self, spec=None):
+    def __init__(self, spec: object | None = None) -> None:
         if not spec:
             self._specs = set()
             self.join_type = JoinTypes.AND
@@ -42,7 +44,7 @@ def __init__(self, spec=None):
         return
 
     @classmethod
-    def _parse(cls, spec) -> set[Specifier]:
+    def _parse(cls, spec: object) -> set[Specifier]:
         spec = cls._split_specifier(spec)
         result = set()
         for constr in spec:
@@ -74,7 +76,7 @@ def _parse(cls, spec) -> set[Specifier]:
         return result
 
     @staticmethod
-    def _split_specifier(spec) -> list[str]:
+    def _split_specifier(spec: object) -> list[str]:
         if isinstance(spec, (list, tuple)):
             return list(spec)
         spec = str(spec)
@@ -169,7 +171,7 @@ def _parse_npm(constr: str) -> set[Specifier]:
             left += '.' + ''.join(map(str, version.pre))
         return {Specifier('>=' + left), Specifier('==' + right)}
 
-    def attach_time(self, releases) -> bool:
+    def attach_time(self, releases: Iterable) -> bool:
         """Attach time to all specifiers if possible
         """
         ok = False
@@ -247,27 +249,27 @@ def python_compat(self) -> bool:
 
     # magic methods
 
-    def __add__(self, other):
+    def __add__(self, other: object) -> RangeSpecifier:
         new = self.copy()
         attached = new._attach(other)
         if attached:
             return new
         return NotImplemented
 
-    def __radd__(self, other):
+    def __radd__(self, other: object) -> RangeSpecifier:
         new = self.copy()
         attached = new._attach(other)
         if attached:
             return new
         return NotImplemented
 
-    def __iadd__(self, other):
+    def __iadd__(self, other: object) -> RangeSpecifier:
         attached = self._attach(other)
         if attached:
             return self
         return NotImplemented
 
-    def _attach(self, other) -> bool:
+    def _attach(self, other: object) -> bool:
         if isinstance(other, GitSpecifier):
             self._specs.add(other)
             return True
@@ -316,34 +318,34 @@ def _attach(self, other) -> bool:
         self._specs = new_specs
         return True
 
-    def __contains__(self, release) -> bool:
+    def __contains__(self, release: object) -> bool:
         rule = all if self.join_type == JoinTypes.AND else any
         return rule((release in specifier) for specifier in self._specs)
 
-    def __str__(self):
+    def __str__(self) -> str:
         if not self._specs:
             return ''
         sep = ',' if self.join_type == JoinTypes.AND else ' || '
         return sep.join(sorted(map(str, self._specs)))
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return '{name}({spec})'.format(
             name=self.__class__.__name__,
             spec=str(self),
         )
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return bool(self._specs)
 
-    def __lt__(self, other):
+    def __lt__(self, other: object) -> bool:
         if not isinstance(other, type(self)):
             return False
         return str(self) < str(other)
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
         if not isinstance(other, type(self)):
             return False
         return str(self) == str(other)
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return hash(str(self))

dephell_specifier/specifier.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
 import operator
-from typing import Any, Callable
+from typing import Any, Callable, Iterable
 
 from packaging import specifiers
 from packaging.version import Version, parse
 
 from .utils import cached_property
 
 
-OPERATIONS = {
+OPERATIONS: dict[str, Callable[[Any, Any], bool]] = {
     '==': operator.eq,
     '!=': operator.ne,
 
@@ -20,7 +20,7 @@
     '>': operator.gt,
 }
 
-OPERATORS_MERGE = {
+OPERATORS_MERGE: dict[frozenset[str], str | None] = {
     # different
     frozenset({'>', '<'}):      None,
     frozenset({'>=', '<='}):    '==',
@@ -47,21 +47,21 @@
 class Specifier:
     time = None
 
-    def __init__(self, constr):
+    def __init__(self, constr: object) -> None:
         try:
             self._spec = specifiers.Specifier(str(constr), prereleases=True)
         except specifiers.InvalidSpecifier:
             raise specifiers.InvalidSpecifier(constr)
 
-    def attach_time(self, releases) -> bool:
+    def attach_time(self, releases: Iterable) -> bool:
         for release in releases:
             if release.time.year != 1970:
                 if str(release.version) == self._spec.version:
                     self.time = release.time
                     return True
         return False
 
-    def _check_version(self, version) -> bool:
+    def _check_version(self, version: Version | str) -> bool:
         """
         https://www.python.org/dev/peps/pep-0440/
         """
@@ -119,7 +119,7 @@ def __repr__(self) -> str:
             spec=str(self._spec),
         )
 
-    def __add__(self, other):
+    def __add__(self, other: object):
         if not isinstance(other, type(self)):
             return NotImplemented
 
@@ -150,10 +150,14 @@ def __add__(self, other):
 
         return NotImplemented
 
-    def __lt__(self, other) -> bool:
+    def __lt__(self, other: object) -> bool:
+        if not isinstance(other, type(self)):
+            return NotImplemented
         return self.version < other.version
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, type(self)):
+            return NotImplemented
         return self.version == other.version and self.operator == other.operator
 
     def __hash__(self) -> int:

dephell_specifier/utils.py

@@ -9,7 +9,7 @@ class cached_property:  # noqa: N801
     with an ordinary attribute. Deleting the attribute resets the property.
     """
 
-    def __init__(self, func):
+    def __init__(self, func) -> None:
         self.__doc__ = func.__doc__
         self.func = func