replace delattr with ModuleLoadEnvironment.remove() in gcc and intelbase easyblocks

Author: lexming

easybuild/easyblocks/g/gcc.py

@@ -207,13 +207,9 @@ def __init__(self, *args, **kwargs):
         # cases where paths top libraries needed to be set explicitly
         # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3256
         # Therefore, remove paths from header search paths but keep paths in LIBRARY_PATH
-        for header_search_path in self.module_load_environment.alias_vars('HEADERS'):
-            try:
-                delattr(self.module_load_environment, header_search_path)
-            except AttributeError:
-                pass
-            else:
-                self.log.debug(f"Removing ${header_search_path} from module file of {self.name}")
+        for disallowed_var in self.module_load_environment.alias_vars('HEADERS'):
+            self.module_load_environment.remove(disallowed_var)
+            self.log.debug(f"Purposely not updating ${disallowed_var} in {self.name} module file")
 
     def create_dir(self, dirname):
         """

easybuild/easyblocks/generic/intelbase.py

@@ -140,12 +140,8 @@ def prepare_intel_tools_env(self):
         mod_env_headers = self.module_load_environment.alias_vars('HEADERS')
         mod_env_libs = ['LD_LIBRARY_PATH', 'LIBRARY_PATH']
         for disallowed_var in mod_env_headers + mod_env_libs:
-            try:
-                delattr(self.module_load_environment, disallowed_var)
-            except AttributeError:
-                pass
-            else:
-                self.log.debug(f"Purposely not updating ${disallowed_var} in {self.name} module file")
+            self.module_load_environment.remove(disallowed_var)
+            self.log.debug(f"Purposely not updating ${disallowed_var} in {self.name} module file")
 
     def get_custom_paths_tools(self, binaries):
         """Custom sanity check paths for certain Intel tools."""