lint

Author: Crivella

easybuild/os_hook.py

@@ -24,6 +24,7 @@ def __dir__(self):
     def register_override(cls, name, value):
         cls.overrides[name] = value
 
+
 class OSProxy(types.ModuleType):
     """Proxy module to intercept os attribute access."""
     overrides = {}
@@ -68,6 +69,7 @@ def create_module(self, spec):
     def exec_module(self, module):
         """Needs to be defined, can be used to alter the module after creation if needed."""
 
+
 class SubprocessLoader(importlib.abc.Loader):
     """Loader to create our SubprocessProxy instead of the real subprocess module."""
     def create_module(self, spec):
@@ -89,10 +91,7 @@ def install_os_hook():
         sys.meta_path.insert(0, HookFinder())
 
     # If already imported, replace in place
-    for name, proxy in [
-            ("os", OSProxy),
-            ("subprocess", SubprocessProxy)
-        ]:
+    for name, proxy in [("os", OSProxy), ("subprocess", SubprocessProxy)]:
         if name in sys.modules and not isinstance(sys.modules[name], proxy):
             real_module = sys.modules[name]
             sys.modules[name] = proxy(real_module)

easybuild/tools/environment.py

@@ -373,16 +373,16 @@ def __deepcopy__(self, memo):
         return apply_context()
 
 
-OSProxy.register_override('environ', ContextEnviron())
-OSProxy.register_override('getenv', lambda key, default=None: getvar(key, default))
-OSProxy.register_override('unsetenv', lambda key: unset_env_vars([key], verbose=False))
-
-
 class ContextPopen(subprocess._real.Popen):
     """Custom Popen class to apply the current context's environment changes when spawning subprocesses."""
     def __init__(self, *args, **kwargs):
         if kwargs.get('env', None) is None:
             kwargs['env'] = apply_context()
         super().__init__(*args, **kwargs)
 
+
+OSProxy.register_override('environ', ContextEnviron())
+OSProxy.register_override('getenv', lambda key, default=None: getvar(key, default))
+OSProxy.register_override('unsetenv', lambda key: unset_env_vars([key], verbose=False))
+
 SubprocessProxy.register_override('Popen', ContextPopen)

easybuild/tools/run.py

@@ -68,7 +68,6 @@
 from easybuild.tools.hooks import RUN_SHELL_CMD, load_hooks, run_hook
 from easybuild.tools.output import COLOR_RED, COLOR_YELLOW, colorize, escape_for_rich, print_error
 from easybuild.tools.utilities import trace_msg
-from easybuild.tools.environment import apply_context
 
 
 _log = fancylogger.getLogger('run', fname=False)