Merge pull request #134 from r1chardj0n3s/fix-multipart

Account for the case where the found module does not have an __init__.py

Author: adamtheturtle

pip_check_reqs/common.py

@@ -85,12 +85,21 @@ def _add_module(self, modname: str, lineno: int) -> None:
 
         modpath = find_spec_result.origin
         assert modpath is not None
+        modpath_path = Path(modpath)
         modname = find_spec_result.name
 
         if modname not in self._modules:
+            if modpath_path.is_file():
+                if modpath_path.name == "__init__.py":
+                    modpath_path = modpath_path.parent
+                else:
+                    # We have this empty "else" so that we are
+                    # not tempted to combine the "is file" and "is __init__"
+                    # checks, and to make sure we have coverage for this case.
+                    pass
             self._modules[modname] = FoundModule(
                 modname=modname,
-                filename=str(Path(modpath).parent),
+                filename=str(modpath_path),
             )
         assert isinstance(self._location, str)
         self._modules[modname].locations.append((self._location, lineno))

tests/test_common.py

@@ -5,6 +5,7 @@
 import ast
 import logging
 import os.path
+import sys
 import textwrap
 from pathlib import Path
 
@@ -59,6 +60,11 @@ def test_import_visitor(stmt: str, result: list[str]) -> None:
     vis.visit(ast.parse(stmt))
     finalise_result = vis.finalise()
     assert set(finalise_result.keys()) == set(result)
+    for value in finalise_result.values():
+        assert str(value.filename) not in sys.path
+        assert Path(value.filename).name != "__init__.py"
+        assert Path(value.filename).is_absolute()
+        assert Path(value.filename).exists()
 
 
 def test_pyfiles_file(tmp_path: Path) -> None: