py: drop importlib.resources

Signed-off-by: Filipe Laíns <lains@riseup.net>

Author: FFY00

pyproject.toml

@@ -35,7 +35,6 @@ requires-python = '>= 3.8'
 dependencies = [
   'colorama; os_name == "nt"',
   'importlib_metadata; python_version < "3.10"',
-  'importlib_resources; python_version < "3.10"',
 ]
 
 [project.optional-dependencies]

src/pkgconf/__init__.py

@@ -20,10 +20,8 @@
 
 if sys.version_info >= (3, 10):
     import importlib.metadata as importlib_metadata
-    import importlib.resources as importlib_resources
 else:
     import importlib_metadata
-    import importlib_resources
 
 
 __version__ = '2.1.1-8'
@@ -54,9 +52,10 @@ def get_executable() -> pathlib.Path:
     else:
         raise NotImplementedError
 
-    executable = pathlib.Path(importlib_resources.files('pkgconf') / '.bin' / executable_name)
-    if executable.exists():
-        return executable
+    for path in __path__:
+        executable = pathlib.Path(path) / '.bin' / executable_name
+        if executable.exists():
+            return executable
 
     warnings.warn('Bundled pkgconf not found, using the system executable', stacklevel=2)
     executable = _get_system_executable()
@@ -69,9 +68,10 @@ def get_executable() -> pathlib.Path:
 
 def _get_module_paths(name: str) -> Sequence[str]:
     module = importlib.import_module(name)
-    if 'NamespacePath' in module.__path__.__class__.__name__:
+    if isinstance(module.__path__, list) or 'NamespacePath' in module.__path__.__class__.__name__:
         return list(module.__path__)
-    return [os.fspath(importlib_resources.files(name))]
+    assert isinstance(module.__path__, str), module.__path__
+    return [module.__path__]
 
 
 def get_pkg_config_path() -> Sequence[str]:

src/pkgconf/diagnose.py

@@ -1,5 +1,4 @@
 import importlib.metadata
-import importlib.resources
 import os
 
 import pkgconf
@@ -13,7 +12,7 @@ def report() -> None:
     for entry in entrypoints:
         print(f'  {entry.name}:')
         print(f'    value: {entry.value}')
-        print(f'    path: {os.fspath(importlib.resources.files(entry.value))}')
+        print(f'    paths: {pkgconf._get_module_paths(entry.value)}')
 
     print(f'PKG_CONFIG_PATH: {os.pathsep.join(pkgconf.get_pkg_config_path())}')