From fb2bbaf2290d48094882b49c7846a112272f1fbb Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Feb 03 2025 13:43:04 +0000 Subject: PR#4307: choose correct import machinery in unit test Merges #4307 https://pagure.io/koji/pull-request/4307 Fixes: #4306 https://pagure.io/koji/issue/4306 failures in tests/test_lib/test_plugin.py --- diff --git a/tests/test_lib/test_plugin.py b/tests/test_lib/test_plugin.py index 24b3683..d80e76e 100644 --- a/tests/test_lib/test_plugin.py +++ b/tests/test_lib/test_plugin.py @@ -9,17 +9,14 @@ from six.moves import range import sys import unittest -try: - import imp - importlib = None -except ImportError: - import importlib - imp = None - import koji import koji.util import koji.plugin +# check which import machinery the lib is using +imp = getattr(koji.plugin, 'imp', None) +importlib = koji.plugin.importlib + class TestCallbackDecorators(unittest.TestCase):