From 48b332d4abf00c316b56b078a8c02fcac0bce61e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?= Date: Fri, 3 Jan 2025 18:39:14 +0100 Subject: [PATCH] Backwards compatibility for importlib Use parameter format compatible with Python <= 3.10 --- qubesappmenus/__init__.py | 6 +++--- qubesappmenus/receive.py | 2 +- qubesappmenus/tests.py | 28 ++++++++++++++-------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qubesappmenus/__init__.py b/qubesappmenus/__init__.py index a8bf14e..c6ead61 100644 --- a/qubesappmenus/__init__.py +++ b/qubesappmenus/__init__.py @@ -345,7 +345,7 @@ def _appmenus_create_onedir(self, vm, force=False, refresh_cache=True, anything_changed = False directory_changed = False directory_file = self._directory_path(vm, dispvm=dispvm) - data = importlib.resources.files(__name__).joinpath( + data = importlib.resources.files(__package__).joinpath( self.directory_template_name(vm, dispvm)).read_text() if self.write_desktop_file( vm, @@ -384,7 +384,7 @@ def _appmenus_create_onedir(self, vm, force=False, refresh_cache=True, if not dispvm: vm_settings_fname = os.path.join( appmenus_dir, self.settings_name(vm)) - data = importlib.resources.files(__name__).joinpath( + data = importlib.resources.files(__package__).joinpath( 'qubes-vm-settings.desktop.template').read_text() if self.write_desktop_file( vm, @@ -597,7 +597,7 @@ def appmenus_init(self, vm, src=None): with open( os.path.join(own_templates_dir, 'qubes-start.desktop'), 'wb') as qubes_start_f: - data = importlib.resources.files(__name__).joinpath( + data = importlib.resources.files(__package__).joinpath( 'qubes-start.desktop.template').read_bytes() qubes_start_f.write(data) diff --git a/qubesappmenus/receive.py b/qubesappmenus/receive.py index 98be373..1071e59 100755 --- a/qubesappmenus/receive.py +++ b/qubesappmenus/receive.py @@ -306,7 +306,7 @@ def process_appmenus_templates(appmenusext, vm, appmenus): with open(qubes_start_fname, 'wb') as qubes_start_f: vm.log.info("Creating Start") template_data = importlib.resources.files( - __name__).joinpath( + __package__).joinpath( 'qubes-start.desktop.template').read_bytes() qubes_start_f.write(template_data) diff --git a/qubesappmenus/tests.py b/qubesappmenus/tests.py index 0035c26..2fb3714 100644 --- a/qubesappmenus/tests.py +++ b/qubesappmenus/tests.py @@ -248,7 +248,7 @@ def test_005_created_appvm(self): with open(os.path.join(self.ext.templates_dirs(tpl)[0], 'evince.desktop'), 'wb') as f: f.write(importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop.template').read_bytes()) self.ext.appmenus_create(appvm, refresh_cache=False) self.ext.appicons_create(appvm) @@ -256,7 +256,7 @@ def test_005_created_appvm(self): self.assertPathExists(evince_path) with open(evince_path, 'rb') as f: new_file_bytes = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop').read_bytes() self.assertEqual( new_file_bytes.replace(b'%BASEDIR%', @@ -283,7 +283,7 @@ def test_006_created_appvm_custom(self): with open(os.path.join(self.ext.templates_dirs(tpl)[0], 'evince.desktop'), 'wb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop.template').read_bytes() f.write(evince_data) self.ext.appmenus_create(appvm, refresh_cache=False) @@ -292,13 +292,13 @@ def test_006_created_appvm_custom(self): with open(os.path.join(self.ext.templates_dirs(tpl)[0], 'xterm.desktop'), 'wb') as f: xterm_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/xterm.desktop.template').read_bytes() f.write(xterm_data) with open(os.path.join(self.ext.templates_dirs(tpl)[0], 'evince.desktop'), 'wb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop.template').read_bytes() f.write(evince_data.replace(b'Document Viewer', b'Random Viewer')) self.ext.appmenus_update(appvm) @@ -306,7 +306,7 @@ def test_006_created_appvm_custom(self): self.assertPathExists(evince_path) with open(evince_path, 'rb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop').read_bytes() self.assertEqual( evince_data @@ -319,7 +319,7 @@ def test_006_created_appvm_custom(self): self.assertPathExists(xterm_path) with open(xterm_path, 'rb') as f: xterm_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/xterm.desktop').read_bytes() self.assertEqual(xterm_data .replace(b'%BASEDIR%', qubesappmenus.basedir.encode()), @@ -347,7 +347,7 @@ def test_007_created_dispvm(self): with open(os.path.join(self.ext.templates_dirs(tpl)[0], 'evince.desktop'), 'wb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop.template').read_bytes() f.write(evince_data) self.ext.appmenus_create(appvm, refresh_cache=False) @@ -400,7 +400,7 @@ class PopenMockup(object): self.assertEqual(service, 'qubes.GetAppmenus') p = PopenMockup() p.stdout = importlib.resources.files( - anchor=__name__).joinpath('test-data/appmenus.input').open(mode='rb') + __package__).joinpath('test-data/appmenus.input').open(mode='rb') p.wait = lambda: None p.returncode = 0 return p @@ -523,7 +523,7 @@ def test_120_create_appvm(self, mock_subprocess): 'evince.desktop') with open(old_path, 'wb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop.template').read_bytes() f.write(evince_data) appvm = TestVM('test-inst-app', @@ -552,7 +552,7 @@ def test_120_create_appvm(self, mock_subprocess): self.assertPathExists(evince_path) with open(evince_path, 'rb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop').read_bytes() self.assertEqual( evince_data.replace(b'%BASEDIR%', @@ -601,7 +601,7 @@ def test_121_create_appvm_with_whitelist(self, mock_subprocess): with open(os.path.join(self.ext.templates_dirs(tpl)[0], 'evince.desktop'), 'wb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop.template').read_bytes() f.write(evince_data) with open(os.path.join(self.basedir, @@ -621,7 +621,7 @@ def test_121_create_appvm_with_whitelist(self, mock_subprocess): self.assertPathExists(evince_path) with open(evince_path, 'rb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop').read_bytes() self.assertEqual( evince_data.replace(b'%BASEDIR%', @@ -688,7 +688,7 @@ class PopenMockup(object): self.assertPathExists(evince_path) with open(evince_path, 'rb') as f: evince_data = importlib.resources.files( - anchor=__name__).joinpath( + __package__).joinpath( 'test-data/evince.desktop.template').read_bytes() self.assertEqual( evince_data,