Try to remove imp, again

Author: adamtheturtle

pip_check_reqs/common.py

@@ -2,7 +2,8 @@
 
 import ast
 import fnmatch
-import imp
+# import imp
+import importlib
 import logging
 import os
 import re
@@ -83,14 +84,14 @@ def _add_module(self, modname: str, lineno: int) -> None:
         progress = []
         modpath = last_modpath = None
         for modname_part in modname.split("."):
-            try:
-                _, modpath, _ = imp.find_module(modname_part, path)
-            except ImportError:
-                # the component specified at this point is not importable
-                # (is just an attribute of the module)
-                # *or* it's not actually installed, so we don't care either
+            find_spec_result = importlib.util.find_spec(name=modname_part, package=path)
+
+            if find_spec_result is None:
+                # The component specified at this point is not installed.
                 break
 
+            modpath = find_spec_result.origin
+
             # success! we found *something*
             progress.append(modname_part)
 
@@ -115,7 +116,7 @@ def _add_module(self, modname: str, lineno: int) -> None:
 
         modname = ".".join(progress)
         if modname not in self._modules:
-            self._modules[modname] = FoundModule(modname, modpath)
+            self._modules[modname] = FoundModule(modname=modname, filename=Path(modpath).parent)
         assert isinstance(self._location, str)
         self._modules[modname].locations.append((self._location, lineno))
 

tests/test_common.py

@@ -47,7 +47,7 @@ def test_found_module() -> None:
         ("import ast, pathlib", ["ast", "pathlib"]),
         ("from pathlib import Path", ["pathlib"]),
         ("from string import hexdigits", ["string"]),
-        ("import distutils.command.check", ["distutils.command.check"]),
+        ("import distutils.command.check", ["distutils"]),
         ("import spam", []),  # don't break because bad programmer
         ("from .foo import bar", []),  # don't break on relative imports
         ("from . import baz", []),
@@ -94,24 +94,21 @@ def test_pyfiles_package(tmp_path: Path) -> None:
     ]
 
 
-# Beware - using `sys` or `os` here can have weird results.
-# See the comment in the implementation.
-# We don't mind so much as we only really use this for third party packages.
 @pytest.mark.parametrize(
     ["ignore_ham", "ignore_hashlib", "expect", "locs"],
     [
         (
             False,
             False,
-            ["ast", "pathlib", "hashlib"],
+            ["ast", "pathlib", "hashlib", "sys"],
             [
                 ("spam.py", 2),
                 ("ham.py", 2),
             ],
         ),
-        (False, True, ["ast", "pathlib"], [("spam.py", 2), ("ham.py", 2)]),
-        (True, False, ["ast"], [("spam.py", 2)]),
-        (True, True, ["ast"], [("spam.py", 2)]),
+        (False, True, ["ast", "pathlib", "sys"], [("spam.py", 2), ("ham.py", 2)]),
+        (True, False, ["ast", "sys"], [("spam.py", 2)]),
+        (True, True, ["ast", "sys"], [("spam.py", 2)]),
     ],
 )
 def test_find_imported_modules(