Make find_imported_modules take a list of Path, not str

Author: adamtheturtle

pip_check_reqs/common.py

@@ -136,13 +136,13 @@ def pyfiles(root: Path) -> Generator[str, None, None]:
 
 
 def find_imported_modules(
-    paths: Iterable[str],
+    paths: Iterable[Path],
     ignore_files_function: Callable[[str], bool],
     ignore_modules_function: Callable[[str], bool],
 ) -> Dict[str, FoundModule]:
     vis = _ImportVisitor(ignore_modules_function=ignore_modules_function)
     for path in paths:
-        for filename in pyfiles(Path(path)):
+        for filename in pyfiles(path):
             if ignore_files_function(filename):
                 log.info("ignoring: %s", os.path.relpath(filename))
                 continue

pip_check_reqs/find_extra_reqs.py

@@ -5,8 +5,8 @@
 import importlib.metadata
 import logging
 import os
-import pathlib
 import sys
+from pathlib import Path
 from typing import Callable, Iterable, List, Optional, Union
 
 from packaging.utils import canonicalize_name
@@ -21,7 +21,7 @@
 
 def find_extra_reqs(
     requirements_filename: str,
-    paths: Iterable[str],
+    paths: Iterable[Path],
     ignore_files_function: Callable[[str], bool],
     ignore_modules_function: Callable[[str], bool],
     ignore_requirements_function: Callable[
@@ -48,8 +48,8 @@ def find_extra_reqs(
         package_location = package.location
         package_files = []
         for item in package.files or []:
-            here = pathlib.Path(".").resolve()
-            item_location_rel = pathlib.Path(package_location) / item
+            here = Path(".").resolve()
+            item_location_rel = Path(package_location) / item
             item_location = item_location_rel.resolve()
             try:
                 relative_item_location = item_location.relative_to(here)
@@ -109,7 +109,7 @@ def main(arguments: Optional[List[str]] = None) -> None:
     """Main entry point."""
     usage = "usage: %prog [options] files or directories"
     parser = argparse.ArgumentParser(usage)
-    parser.add_argument("paths", nargs="*")
+    parser.add_argument("paths", type=Path, nargs="*")
     parser.add_argument(
         "--requirements-file",
         dest="requirements_filename",

pip_check_reqs/find_missing_reqs.py

@@ -5,8 +5,8 @@
 import importlib.metadata
 import logging
 import os
-import pathlib
 import sys
+from pathlib import Path
 from typing import Callable, Iterable, List, Optional, Tuple
 
 from packaging.utils import NormalizedName, canonicalize_name
@@ -23,7 +23,7 @@
 
 def find_missing_reqs(
     requirements_filename: str,
-    paths: Iterable[str],
+    paths: Iterable[Path],
     ignore_files_function: Callable[[str], bool],
     ignore_modules_function: Callable[[str], bool],
 ) -> List[Tuple[NormalizedName, List[FoundModule]]]:
@@ -46,8 +46,8 @@ def find_missing_reqs(
         package_location = package.location
         package_files = []
         for item in package.files or []:
-            here = pathlib.Path(".").resolve()
-            item_location_rel = pathlib.Path(package_location) / item
+            here = Path(".").resolve()
+            item_location_rel = Path(package_location) / item
             item_location = item_location_rel.resolve()
             try:
                 relative_item_location = item_location.relative_to(here)
@@ -113,7 +113,7 @@ def find_missing_reqs(
 def main(arguments: Optional[List[str]] = None) -> None:
     usage = "usage: %prog [options] files or directories"
     parser = argparse.ArgumentParser(usage)
-    parser.add_argument("paths", nargs="*")
+    parser.add_argument("paths", type=Path, nargs="*")
     parser.add_argument(
         "--requirements-file",
         dest="requirements_filename",

tests/test_common.py

@@ -156,7 +156,7 @@ def ignore_mods(module: str) -> bool:
         return False
 
     result = common.find_imported_modules(
-        paths=[str(root)],
+        paths=[root],
         ignore_files_function=ignore_files,
         ignore_modules_function=ignore_mods,
     )
@@ -241,7 +241,7 @@ def mocked_open(*args: Any, **kwargs: Any) -> Any:
 
     monkeypatch.setattr(builtins, "open", mocked_open)
     common.find_imported_modules(
-        paths=[str(tmp_path)],
+        paths=[tmp_path],
         ignore_files_function=common.ignorer(ignore_cfg=[]),
         ignore_modules_function=common.ignorer(ignore_cfg=[]),
     )

tests/test_find_extra_reqs.py

@@ -43,7 +43,7 @@ def test_find_extra_reqs(tmp_path: Path) -> None:
 
     result = find_extra_reqs.find_extra_reqs(
         requirements_filename=str(fake_requirements_file),
-        paths=[str(source_dir)],
+        paths=[source_dir],
         ignore_files_function=common.ignorer(ignore_cfg=[]),
         ignore_modules_function=common.ignorer(ignore_cfg=[]),
         ignore_requirements_function=common.ignorer(ignore_cfg=[]),

tests/test_find_missing_reqs.py

@@ -44,7 +44,7 @@ def test_find_missing_reqs(tmp_path: Path) -> None:
 
     result = find_missing_reqs.find_missing_reqs(
         requirements_filename=str(fake_requirements_file),
-        paths=[str(source_dir)],
+        paths=[source_dir],
         ignore_files_function=common.ignorer(ignore_cfg=[]),
         ignore_modules_function=common.ignorer(ignore_cfg=[]),
     )