improve type hints

Author: scivision

src/gitutils/find.py

@@ -1,9 +1,9 @@
 from pathlib import Path
-import typing as T
+from collections.abc import Iterator
 import shutil
 
 
-def find_matching_file(path: Path, fn: str) -> T.Iterator[Path]:
+def find_matching_file(path: Path, fn: str) -> Iterator[Path]:
     """
     if full path file is found, return that filename
 
@@ -29,7 +29,7 @@ def find_matching_file(path: Path, fn: str) -> T.Iterator[Path]:
             yield d
 
 
-def find_dir_missing_file(path: Path, fn: str, copyfile: Path | None = None) -> T.Iterator[Path]:
+def find_dir_missing_file(path: Path, fn: str, copyfile: Path | None = None) -> Iterator[Path]:
     """
     if directory is missing a file, copy the file to that directory
 

src/gitutils/git.py

@@ -4,7 +4,7 @@
 
 from pathlib import Path
 import subprocess
-import typing
+from collections.abc import Iterator
 import shutil
 import functools
 import os
@@ -45,7 +45,7 @@ def git_exe() -> str:
     return exe
 
 
-def gitdirs(path: Path) -> typing.Iterator[Path]:
+def gitdirs(path: Path) -> Iterator[Path]:
     """
     Generator for Git directories
 

src/gitutils/git_email.py

@@ -3,7 +3,7 @@
 """
 
 from pathlib import Path
-import typing as T
+from collections.abc import Iterator, Iterable
 import collections
 import logging
 import subprocess
@@ -15,7 +15,7 @@
 
 def gitemail(
     path: Path, exclude: str | None = None, timeout=TIMEOUT["local"]
-) -> T.Iterator[tuple[Path, list[tuple[str, int]]]]:
+) -> Iterator[tuple[Path, list[tuple[str, int]]]]:
     """
     returns email addresses of everyone who ever made a Git commit in this repo.
 
@@ -46,7 +46,7 @@ def gitemail(
             logging.error(f"{path}  {e}")
             continue
 
-        addrs: T.Iterable[str] = filter(None, ret.replace('"', "").split("\n"))
+        addrs: Iterable[str] = filter(None, ret.replace('"', "").split("\n"))
         # remove blanks
         if exclude:
             addrs = (n for n in addrs if not n.startswith(exclude))

src/gitutils/status.py

@@ -3,7 +3,7 @@
 """
 
 import argparse
-import typing
+from collections.abc import Iterator
 from pathlib import Path
 import asyncio
 from pprint import pprint
@@ -15,7 +15,7 @@
 from .status_cmd import git_status_serial, git_status_async
 
 
-def git_status(path: Path, verbose: bool) -> typing.Iterator[tuple[Path, dict]]:
+def git_status(path: Path, verbose: bool) -> Iterator[tuple[Path, dict]]:
 
     for d in gitdirs(path):
         repo = pygit2.Repository(d)