Merge pull request #412 from mvertens/feature/update_buildlib

replaced imp.load_source with importlib.machinery.SourceFileLoader
NorESMhub · Oct 16, 2024 · cbca1a6 · cbca1a6
2 parents 816981a + 7ec2942
commit cbca1a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/cime_config/buildlib b/cime_config/buildlib
@@ -3,7 +3,7 @@
 """
 build blom library
 """
-import os, shutil, sys, glob, imp
+import os, sys
 
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:

diff --git a/cime_config/buildlib_2.1 b/cime_config/buildlib_2.1
@@ -3,7 +3,8 @@
 """
 build blom library
 """
-import os, shutil, sys, glob, imp
+import os, shutil, sys, glob
+from importlib.machinery import SourceFileLoader
 
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
@@ -32,7 +33,7 @@ def _main_func():
         cmd = os.path.join(os.path.join(comp_root_dir_ocn, "cime_config", "buildcpp"))
         logger.info("     ...calling blom buildcpp to set build time options")
         try:
-            mod = imp.load_source("buildcpp", cmd)
+            mod = SourceFileLoader("buildcpp", cmd).load_module()
             blom_cppdefs = mod.buildcpp(case)
         except:
             raise

diff --git a/cime_config/buildlib_2.2 b/cime_config/buildlib_2.2
@@ -3,7 +3,8 @@
 """
 build blom library
 """
-import os, shutil, sys, glob, imp
+import os, shutil, sys, glob
+from importlib.machinery import SourceFileLoader
 
 _CIMEROOT = os.environ.get("CIMEROOT")
 if _CIMEROOT is None:
@@ -33,7 +34,7 @@ def _main_func():
         cmd = os.path.join(os.path.join(comp_root_dir_ocn, "cime_config", "buildcpp"))
         logger.info("     ...calling blom buildcpp to set build time options")
         try:
-            mod = imp.load_source("buildcpp", cmd)
+            mod = SourceFileLoader("buildcpp", cmd).load_module()
             blom_cppdefs = mod.buildcpp(case)
         except:
             raise