Replace deprecated use of pkg_resources.

Replace with importlib.

Signed-off-by: Chris PeBenito <[email protected]>

Author: pebenito

setools/__init__.py

@@ -5,9 +5,9 @@
 # SPDX-License-Identifier: LGPL-2.1-only
 #
 try:
-    import pkg_resources
+    from importlib.metadata import distribution
     # pylint: disable=no-member
-    __version__ = pkg_resources.get_distribution("setools").version
+    __version__ = distribution("setools").version
 except ImportError:  # pragma: no cover
     __version__ = "unknown"
 

setools/permmap.py

@@ -7,15 +7,18 @@
 from collections import OrderedDict
 from contextlib import suppress
 from dataclasses import dataclass
-from typing import cast, Dict, Final, Iterable, Optional, Union
-
-import pkg_resources
+from importlib import resources as pkg_resources
+import pathlib
+from typing import cast, Dict, Final, Iterable, Union
 
 from . import exception
 from .descriptors import PermissionMapDescriptor
 from .mixins import TupleCompat
 from .policyrep import AVRule, SELinuxPolicy, TERuletype
 
+# This is the filename in the Python package
+DEFAULT_PERM_MAP: Final[str] = "perm_map"
+
 INFOFLOW_DIRECTIONS: Final = ("r", "w", "b", "n", "u")
 MIN_WEIGHT: Final[int] = 1
 MAX_WEIGHT: Final[int] = 10
@@ -98,25 +101,24 @@ class PermissionMap:
     MIN_WEIGHT: Final[int] = MIN_WEIGHT
     MAX_WEIGHT: Final[int] = MAX_WEIGHT
 
-    def __init__(self, permmapfile: Optional[str] = None) -> None:
+    def __init__(self, permmapfile: str | pathlib.Path | None = None) -> None:
         """
         Parameter:
         permmapfile     The path to the permission map to load.
         """
         self.log = logging.getLogger(__name__)
         self._permmap: MapStruct = OrderedDict()
-        self._permmapfile: str
+        self._permmapfile: pathlib.Path
 
         if permmapfile:
             self.load(permmapfile)
         else:
-            distro = pkg_resources.get_distribution("setools")
-            # pylint: disable=no-member
-            path = "{0}/setools/perm_map".format(distro.location)
-            self.load(path)
+            package_location = pkg_resources.files("setools")
+            with pkg_resources.as_file(package_location / DEFAULT_PERM_MAP) as path:
+                self.load(path)
 
     def __str__(self) -> str:
-        return self._permmapfile
+        return str(self._permmapfile)
 
     def __deepcopy__(self, memo) -> 'PermissionMap':
         newobj = PermissionMap.__new__(PermissionMap)
@@ -131,7 +133,7 @@ def __iter__(self) -> Iterable[Mapping]:
             for mapping in self.perms(cls):
                 yield mapping
 
-    def load(self, permmapfile: str) -> None:
+    def load(self, permmapfile: str | pathlib.Path) -> None:
         """
         Parameter:
         permmapfile     The path to the permission map to load.
@@ -239,7 +241,7 @@ def load(self, permmapfile: str) -> None:
                     if perm_count >= num_perms:
                         state = 2
 
-        self._permmapfile = permmapfile
+        self._permmapfile = pathlib.Path(permmapfile)
         self.log.info("Successfully opened permission map \"{0}\"".format(permmapfile))
         self.log.debug("Read {0} classes and {1} total permissions.".format(
                        class_count, total_perms))

setoolsgui/apol.py

@@ -4,13 +4,13 @@
 from collections import defaultdict
 from contextlib import suppress
 from functools import partial
+from importlib import resources as pkg_resources
 import json
 import logging
 import os
 import sys
 import typing
 
-import pkg_resources
 from PyQt6 import QtCore, QtGui, QtWidgets
 import setools
 
@@ -1067,9 +1067,10 @@ def run_apol(policy: str | None = None) -> int:
     app = QtWidgets.QApplication(sys.argv)
 
     # load apol stylesheet
-    distro = pkg_resources.get_distribution("setools")
-    with open(f"{distro.location}/setoolsgui/{STYLESHEET}", "r", encoding="utf-8") as fd:
-        app.setStyleSheet(fd.read())
+    package_location = pkg_resources.files("setoolsgui")
+    with pkg_resources.as_file(package_location / STYLESHEET) as path:
+        with open(path, "r", encoding="utf-8") as fd:
+            app.setStyleSheet(fd.read())
 
     #
     # Create main window

setoolsgui/widgets/helpdialog.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-only
 
+from importlib import resources as pkg_resources
+
 from PyQt6 import QtCore, QtWidgets
 
 __all__ = ("HtmlHelpDialog",)
@@ -40,6 +42,17 @@ def from_file(cls, title: str, filename: str, /,
 
         return cls(title, html, parent)
 
+    @classmethod
+    def from_package_file(cls, title: str, filename: str, /,
+                          parent: QtWidgets.QWidget | None = None) -> "HtmlHelpDialog":
+
+        """Load HTML from a file in the package and return a new HtmlHelpDialog instance."""
+
+        package_location = pkg_resources.files("setoolsgui")
+        with pkg_resources.as_file(package_location / filename) as path:
+            with open(path, "r", encoding="utf-8") as fd:
+                return cls(title, fd.read(), parent)
+
 
 if __name__ == '__main__':
     import sys
@@ -51,7 +64,7 @@ def from_file(cls, title: str, filename: str, /,
     warnings.simplefilter("default")
 
     app = QtWidgets.QApplication(sys.argv)
-    widget = HtmlHelpDialog.from_file("Test help window", "setoolsgui/apol.html")
+    widget = HtmlHelpDialog.from_package_file("Test help window", "apol.html")
     widget.resize(1024, 768)
     widget.show()
     rc = app.exec()