Merge pull request #632 from htcondor/V24_x-HTCONDOR-2688-fix-module-load

HTCONDOR-2688 fix-module-load

Author: timtheisen

Diff for: src/htcondorce/web.py

@@ -1,7 +1,8 @@
 
 import os
 import re
-import importlib
+import importlib.machinery
+import importlib.util
 import json
 import time
 import logging
@@ -114,7 +115,10 @@ def check_initialized(environ):
                 if not filename.endswith(".py"):
                     continue
                 name = filename[:-3]
-                plugin = importlib.load_source(name, os.path.join(plugins_dir, filename))
+                loader = importlib.machinery.SourceFileLoader(name, os.path.join(plugins_dir, filename))
+                spec = importlib.util.spec_from_loader(loader.name, loader)
+                plugin = importlib.util.module_from_spec(spec)
+                loader.exec_module(plugin)
                 if validate_plugin(name, plugin):
                     log.debug("plugin %s: loaded ok", name)
                     _plugins.append(plugin)

Diff for: tests/test_condor_ce_router_defaults.py

@@ -14,7 +14,7 @@
 loader = importlib.machinery.SourceFileLoader('condor_ce_router_defaults', DEFAULTS_PATH)
 spec = importlib.util.spec_from_loader(loader.name, loader)
 defaults = importlib.util.module_from_spec(spec)
-loader.exec(defaults)
+loader.exec_module(defaults)
 
 class TestDefaults(unittest.TestCase):
     """Unit tests for condor_ce_router_defaults"""

Diff for: tests/test_verify_ce_config.py

@@ -1,7 +1,8 @@
 #!/usr/bin/python3
 """Unit tests for verify_ce_config.py"""
 
-import importlib
+import importlib.machinery
+import importlib.util
 import os
 import unittest
 
@@ -36,7 +37,10 @@
 '''
 
 VERIFY_PATH = os.path.join('..', 'src', 'verify_ce_config.py')
-verify = importlib.load_source('verify_ce_config', VERIFY_PATH)
+loader = importlib.machinery.SourceFileLoader('verify_ce_config', VERIFY_PATH)
+spec = importlib.util.spec_from_loader(loader.name, loader)
+verify = importlib.util.module_from_spec(spec)
+loader.exec_module(verify)
 
 
 class TestVerifyConfig(unittest.TestCase):