From 75d9d6822a59ea3f839d7cb11ef879ee5d49fc52 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Thu, 22 Jun 2023 04:00:39 +0100 Subject: [PATCH] zdtm: drop python 2 compatibility This patch removes the code for Python 2 compatibility introduced with commit e65c7b5 (zdtm: Replace imp module with importlib). Signed-off-by: Radostin Stoyanov --- test/zdtm.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/test/zdtm.py b/test/zdtm.py index b56f06ef1..c6e852dc1 100755 --- a/test/zdtm.py +++ b/test/zdtm.py @@ -635,14 +635,10 @@ class zdtm_test: def load_module_from_file(name, path): - if sys.version_info[0] == 3 and sys.version_info[1] >= 5: - import importlib.util - spec = importlib.util.spec_from_file_location(name, path) - mod = importlib.util.module_from_spec(spec) - spec.loader.exec_module(mod) - else: - import imp - mod = imp.load_source(name, path) + import importlib.util + spec = importlib.util.spec_from_file_location(name, path) + mod = importlib.util.module_from_spec(spec) + spec.loader.exec_module(mod) return mod