From b0064cc0ad99ef6bbe259ac0a7546b84e9863c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marmarta@invisiblethingslab.com>
Date: Fri, 3 May 2024 16:19:39 +0200
Subject: [PATCH] Remove deprecated pkg_resources library

Use the recommended replacement: importlib.
Requires at least Python 3.8 to work with
importlib.metadata.
---
 debian/control                                |  2 +-
 .../tests/backup/backupcompatibility.py       | 26 +++++++++++--------
 qubesadmin/utils.py                           |  4 +--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 6a9d1e13..0932f407 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Homepage: https://www.qubes-os.org/
 #Vcs-Git: git://github.com/QubesOS/qubes-core-admin-client.git
 #Vcs-Browser: https://github.com/QubesOS/qubes-core-admin-client
 X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.4
+X-Python3-Version: >= 3.8
 
 Package: qubes-core-admin-client
 Architecture: any
diff --git a/qubesadmin/tests/backup/backupcompatibility.py b/qubesadmin/tests/backup/backupcompatibility.py
index 9946b677..3be5f925 100644
--- a/qubesadmin/tests/backup/backupcompatibility.py
+++ b/qubesadmin/tests/backup/backupcompatibility.py
@@ -41,7 +41,7 @@
 import re
 
 import multiprocessing
-import pkg_resources
+import importlib.resources
 import sys
 
 import qubesadmin.backup.core2
@@ -759,17 +759,17 @@ def assertCorrectlyConverted(self, backup_app, expected_data):
         self.assertEqual(backup_app.globals, expected_data['globals'])
 
     def test_000_qubes_xml_r2(self):
-        xml_data = pkg_resources.resource_string(__name__, 'v3-qubes.xml')
+        xml_path = importlib.resources.files("qubesadmin") / "tests/backup/v3-qubes.xml"
         with tempfile.NamedTemporaryFile() as qubes_xml:
-            qubes_xml.file.write(xml_data)
+            qubes_xml.file.write(xml_path.read_bytes())
             backup_app = qubesadmin.backup.core2.Core2Qubes(qubes_xml.name)
         self.assertCorrectlyConverted(backup_app, parsed_qubes_xml_r2)
 
     def test_010_qubes_xml_r4(self):
         self.maxDiff = None
-        xml_data = pkg_resources.resource_string(__name__, 'v4-qubes.xml')
+        xml_path = importlib.resources.files("qubesadmin") / "tests/backup/v4-qubes.xml"
         with tempfile.NamedTemporaryFile() as qubes_xml:
-            qubes_xml.file.write(xml_data)
+            qubes_xml.file.write(xml_path.read_bytes())
             backup_app = qubesadmin.backup.core3.Core3Qubes(qubes_xml.name)
         self.assertCorrectlyConverted(backup_app, parsed_qubes_xml_v4)
 
@@ -878,8 +878,8 @@ def create_v1_files(self, r2b2=False):
         self.create_private_img(self.fullpath("appvms/test-work/private.img"))
         with open(self.fullpath("appvms/test-work/firewall.xml"), "wb") as \
                 f_firewall:
-            f_firewall.write(
-                pkg_resources.resource_string(__name__, 'v3-firewall.xml'))
+            xml_path = importlib.resources.files("qubesadmin") / "tests/backup/v3-firewall.xml"
+            f_firewall.write(xml_path.read_bytes())
 
         # StandaloneVM
         os.mkdir(self.fullpath("appvms/test-standalonevm"))
@@ -1042,8 +1042,8 @@ def create_v4_files(self):
         # setup firewall only on one VM
         with open(self.fullpath("appvms/test-work/firewall.xml"), "wb") as \
                 f_firewall:
-            f_firewall.write(
-                pkg_resources.resource_string(__name__, 'v4-firewall.xml'))
+            xml_path = importlib.resources.files("qubesadmin") / "tests/backup/v4-firewall.xml"
+            f_firewall.write(xml_path.read_bytes())
 
         # StandaloneVMs
         for vm in ('test-standalonevm', 'test-hvm'):
@@ -1235,7 +1235,9 @@ def create_v3_backup(self, encrypted=True, compressed=True):
         self.append_backup_stream("backup-header", output)
         self.append_backup_stream("backup-header.hmac", output)
         with open(self.fullpath("qubes.xml"), "wb") as f:
-            qubesxml = pkg_resources.resource_string(__name__, 'v3-qubes.xml')
+            xml_path = importlib.resources.files("qubesadmin") / "tests/backup/v3-qubes.xml"
+
+            qubesxml = xml_path.read_bytes()
             if encrypted:
                 for vmname, subdir in MANGLED_SUBDIRS_R2.items():
                     qubesxml = re.sub(r"[a-z-]*/{}".format(vmname).encode(),
@@ -1300,7 +1302,9 @@ def create_v4_backup(self, compressed="gzip", big=False):
         self.append_backup_stream("backup-header", output)
         self.append_backup_stream("backup-header.hmac", output)
         with open(self.fullpath("qubes.xml"), "wb") as f:
-            qubesxml = pkg_resources.resource_string(__name__, 'v4-qubes.xml')
+            xml_path = importlib.resources.files("qubesadmin") / "tests/backup/v4-qubes.xml"
+
+            qubesxml = xml_path.read_bytes()
             for vmname, subdir in MANGLED_SUBDIRS_R4.items():
                 qubesxml = re.sub(
                     r'backup-path">[a-z-]*/{}'.format(vmname).encode(),
diff --git a/qubesadmin/utils.py b/qubesadmin/utils.py
index 6be3e09f..9614f0f3 100644
--- a/qubesadmin/utils.py
+++ b/qubesadmin/utils.py
@@ -90,8 +90,8 @@ def get_entry_point_one(group, name):
     """Get a single entry point of given type,
     raise TypeError when there are multiple.
     """
-    import pkg_resources
-    epoints = tuple(pkg_resources.iter_entry_points(group, name))
+    import importlib.metadata
+    epoints = tuple(importlib.metadata.entry_points(group=group, name=name))
     if not epoints:
         raise KeyError(name)
     if len(epoints) > 1: