Downgrade mypy for Python 3.7

Author: Avasam

boltons/cacheutils.py

@@ -798,15 +798,15 @@ def iterkeys(self) -> Iterator[_KT]:
     def keys(self) -> list[_KT]:
         return list(self.iterkeys())
 
-    def itervalues(self) -> Generator[int]:
+    def itervalues(self) -> Generator[int, None, None]:
         count_map = self._count_map
         for k in count_map:
             yield count_map[k][0]
 
     def values(self) -> list[int]:
         return list(self.itervalues())
 
-    def iteritems(self) -> Generator[tuple[_KT, int]]:
+    def iteritems(self) -> Generator[tuple[_KT, int], None, None]:
         count_map = self._count_map
         for k in count_map:
             yield (k, count_map[k][0])

boltons/dictutils.py

@@ -462,7 +462,7 @@ def _remove_all(self, k):
             cell[PREV][NEXT], cell[NEXT][PREV] = cell[NEXT], cell[PREV]
         del self._map[k]
 
-    def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT]]:
+    def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT], None, None]:
         """Iterate over the OMD's items in insertion order. By default,
         yields only the most-recently inserted value for each key. Set
         *multi* to ``True`` to get all inserted items.
@@ -477,7 +477,7 @@ def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT]]:
             for key in self.iterkeys():
                 yield key, self[key]
 
-    def iterkeys(self, multi: bool = False) -> Generator[_KT]:
+    def iterkeys(self, multi: bool = False) -> Generator[_KT, None, None]:
         """Iterate over the OMD's keys in insertion order. By default, yields
         each key once, according to the most recent insertion. Set
         *multi* to ``True`` to get all keys, including duplicates, in
@@ -499,7 +499,7 @@ def iterkeys(self, multi: bool = False) -> Generator[_KT]:
                     yield k
                 curr = curr[NEXT]
 
-    def itervalues(self, multi: bool = False) -> Generator[_VT]:
+    def itervalues(self, multi: bool = False) -> Generator[_VT, None, None]:
         """Iterate over the OMD's values in insertion order. By default,
         yields the most-recently inserted value per unique key.  Set
         *multi* to ``True`` to get all values according to insertion
@@ -742,15 +742,15 @@ def _remove_all(self, k):
             cell[PREV][NEXT], cell[NEXT][PREV] = cell[NEXT], cell[PREV]
         cell[PREV][SNEXT] = cell[SNEXT]
 
-    def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT]]:
+    def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT], None, None]:
         next_link = NEXT if multi else SNEXT
         root = self.root
         curr = root[next_link]
         while curr is not root:
             yield curr[KEY], curr[VALUE]
             curr = curr[next_link]
 
-    def iterkeys(self, multi: bool = False) -> Generator[_KT]:
+    def iterkeys(self, multi: bool = False) -> Generator[_KT, None, None]:
         next_link = NEXT if multi else SNEXT
         root = self.root
         curr = root[next_link]
@@ -1017,7 +1017,7 @@ def replace(self, key: _KT, newkey: _KT) -> None:
             revset.remove(key)
             revset.add(newkey)
 
-    def iteritems(self) -> Generator[tuple[_KT, _VT]]:
+    def iteritems(self) -> Generator[tuple[_KT, _VT], None, None]:
         for key in self.data:
             for val in self.data[key]:
                 yield key, val

boltons/fileutils.py

@@ -498,7 +498,7 @@ def __exit__(self, exc_type: type[BaseException] | None, exc_val: BaseException
         return
 
 
-def iter_find_files(directory: str, patterns: str | Iterable[str], ignored: str | Iterable[str] | None = None, include_dirs: bool = False, max_depth: int | None = None) -> Generator[str]:
+def iter_find_files(directory: str, patterns: str | Iterable[str], ignored: str | Iterable[str] | None = None, include_dirs: bool = False, max_depth: int | None = None) -> Generator[str, None, None]:
     """Returns a generator that yields file paths under a *directory*,
     matching *patterns* using `glob`_ syntax (e.g., ``*.txt``). Also
     supports *ignored* patterns.

boltons/iterutils.py

@@ -359,7 +359,7 @@ def postprocess(chk): return bytes(chk)
     return
 
 
-def chunk_ranges(input_size: int, chunk_size: int, input_offset: int = 0, overlap_size: int = 0, align: bool = False) -> Generator[tuple[int, int]]:
+def chunk_ranges(input_size: int, chunk_size: int, input_offset: int = 0, overlap_size: int = 0, align: bool = False) -> Generator[tuple[int, int], None, None]:
     """Generates *chunk_size*-sized chunk ranges for an input with length *input_size*.
     Optionally, a start of the input can be set via *input_offset*, and
     and overlap between the chunks may be specified via *overlap_size*.
@@ -1315,7 +1315,7 @@ def get_path(root, path, default=_UNSET):
                 cur = cur[seg]
             except (KeyError, IndexError) as exc:
                 raise PathAccessError(exc, seg, path)
-            except TypeError as exc:
+            except TypeError:
                 # either string index in a list, or a parent that
                 # doesn't support indexing
                 try:

boltons/jsonutils.py

@@ -52,12 +52,12 @@
 __all__ = ['JSONLIterator', 'reverse_iter_lines']
 
 @overload
-def reverse_iter_lines(file_obj: IO[bytes], blocksize: int = DEFAULT_BLOCKSIZE, preseek: bool = True, encoding: None = None) -> Generator[bytes]: ...
+def reverse_iter_lines(file_obj: IO[bytes], blocksize: int = DEFAULT_BLOCKSIZE, preseek: bool = True, encoding: None = None) -> Generator[bytes, None, None]: ...
 @overload
-def reverse_iter_lines(file_obj: IO[str], blocksize: int = DEFAULT_BLOCKSIZE, preseek: bool = True, *, encoding: str) -> Generator[str]: ...
+def reverse_iter_lines(file_obj: IO[str], blocksize: int = DEFAULT_BLOCKSIZE, preseek: bool = True, *, encoding: str) -> Generator[str, None, None]: ...
 @overload
-def reverse_iter_lines(file_obj: IO[str], blocksize: int, preseek: bool, encoding: str) -> Generator[str]: ...
-def reverse_iter_lines(file_obj: IO[bytes] | IO[str], blocksize: int = DEFAULT_BLOCKSIZE, preseek: bool = True, encoding: str | None = None) -> Generator[bytes] | Generator[str]:
+def reverse_iter_lines(file_obj: IO[str], blocksize: int, preseek: bool, encoding: str) -> Generator[str, None, None]: ...
+def reverse_iter_lines(file_obj: IO[bytes] | IO[str], blocksize: int = DEFAULT_BLOCKSIZE, preseek: bool = True, encoding: str | None = None) -> Generator[bytes, None, None] | Generator[str, None, None]:
     """Returns an iterator over the lines from a file object, in
     reverse order, i.e., last line first, first line last. Uses the
     :meth:`file.seek` method of file objects, and is tested compatible with

boltons/strutils.py

@@ -666,7 +666,7 @@ def gzip_bytes(bytestring: ReadableBuffer, level: int = 6) -> bytes:
                              re.UNICODE)
 
 
-def iter_splitlines(text: str) -> Generator[str]:
+def iter_splitlines(text: str) -> Generator[str, None, None]:
     r"""Like :meth:`str.splitlines`, but returns an iterator of lines
     instead of a list. Also similar to :meth:`file.next`, as that also
     lazily reads and yields lines from a file.

boltons/timeutils.py

@@ -298,7 +298,7 @@ def strpdate(string: str, format: str) -> date:
     return whence.date()
 
 
-def daterange(start: date, stop: date, step: int = 1, inclusive: bool = False) -> Generator[date]:
+def daterange(start: date, stop: date, step: int = 1, inclusive: bool = False) -> Generator[date, None, None]:
     """In the spirit of :func:`range` and :func:`xrange`, the `daterange`
     generator that yields a sequence of :class:`~datetime.date`
     objects, starting at *start*, incrementing by *step*, until *stop*

mypy.ini

@@ -27,4 +27,6 @@ disable_error_code =
 # check_untyped_defs = true
 
 [mypy-sphinx_rtd_theme.*]
-follow_untyped_imports = true
+ignore_missing_imports = True
+# use the following with mypy 1.15+
+# follow_untyped_imports = true

requirements-test.txt

@@ -1,5 +1,5 @@
 coverage==7.2.7
-mypy[faster-cache]==1.15.0
+mypy==1.8.0
 pytest==7.4.4; python_version < "3.8"
 pytest==8.3.4; python_version >= "3.8"
 pytest-cov==4.1.0