squash: avoid .environ

Author: happz

tmt/config/__init__.py

@@ -28,8 +28,10 @@ def effective_config_dir() -> Path:
     :py:const:`DEFAULT_CONFIG_DIR` is picked.
     """
 
-    if 'TMT_CONFIG_DIR' in tmt.utils.Environment.environ:
-        return Path(tmt.utils.Environment.environ['TMT_CONFIG_DIR']).expanduser()
+    environment = tmt.utils.Environment.from_environ()
+
+    if 'TMT_CONFIG_DIR' in environment:
+        return Path(environment['TMT_CONFIG_DIR']).expanduser()
 
     return DEFAULT_CONFIG_DIR.expanduser()
 

tmt/guest/__init__.py

@@ -201,7 +201,7 @@ def configure_ssh_options() -> tmt.utils.RawCommand:
 
     options: tmt.utils.RawCommand = []
 
-    for name, value in Environment.environ.items():
+    for name, value in Environment.from_environ().items():
         match = SSH_OPTIONS_ENVVAR_PATTERN.match(name)
 
         if not match:

tmt/libraries/beakerlib.py

@@ -364,7 +364,7 @@ def _do_fetch(self, directory: Path) -> None:
         else:
             self.parent.debug(f"Cloning '{self.identifier}' for '{self}'.", level=3)
 
-            environment = Environment.environ
+            environment = Environment.from_environ()
             environment["GIT_ASKPASS"] = EnvVarValue("echo")
 
             tmt.utils.git.git_clone(

tmt/log.py

@@ -144,7 +144,7 @@ def create_decolorizer(apply_colors: bool) -> Callable[[str], str]:
 def _debug_level_from_global_envvar() -> Optional[DebugLevel]:
     import tmt.utils
 
-    raw_value = tmt.utils.Environment.environ.get('TMT_DEBUG', None)
+    raw_value = tmt.utils.Environment.from_environ().get('TMT_DEBUG', None)
 
     if raw_value is None:
         return 0
@@ -194,15 +194,17 @@ def decide_colorization(no_color: bool, force_color: bool) -> tuple[bool, bool]:
 
     from tmt.utils import Environment
 
+    environment = Environment.from_environ()
+
     # Default values: assume colors & unicorns everywhere.
     apply_colors_output = apply_colors_logging = True
 
     # Enforce colors if `--force-color` was used, or `TMT_FORCE_COLOR` envvar is set.
-    if force_color or 'TMT_FORCE_COLOR' in Environment.environ:
+    if force_color or 'TMT_FORCE_COLOR' in environment:
         apply_colors_output = apply_colors_logging = True
 
     # Disable coloring if `--no-color` was used, or `NO_COLOR` or `TMT_NO_COLOR` envvar is set.
-    elif no_color or 'NO_COLOR' in Environment.environ or 'TMT_NO_COLOR' in Environment.environ:
+    elif no_color or 'NO_COLOR' in environment or 'TMT_NO_COLOR' in environment:
         apply_colors_output = apply_colors_logging = False
 
     # Autodetection, disable colors when not talking to a terminal.

tmt/plugins/__init__.py

@@ -122,13 +122,15 @@ def _explore_custom_directories(logger: Logger) -> None:
     logger.debug('Import plugins from custom directories.')
     logger = logger.descend()
 
-    if not tmt.utils.Environment.environ.get(ENVIRONMENT_NAME):
+    environment = tmt.utils.Environment.from_environ()
+
+    if not environment.get(ENVIRONMENT_NAME):
         logger.debug(
             f"No custom directories found in the '{ENVIRONMENT_NAME}' environment variable."
         )
         return
 
-    for _path in tmt.utils.Environment.environ[ENVIRONMENT_NAME].split(os.pathsep):
+    for _path in environment[ENVIRONMENT_NAME].split(os.pathsep):
         # TID251: `pathlib` does not provide `os.patch.expandvars`, its
         # use is allowed. For the simplicity, keeping `expanduser` as well,
         # to avoid str -> Path -> str -> Path conversion.

tmt/steps/__init__.py

@@ -1263,7 +1263,7 @@ def _log_raw_data(stage: str, raw_data: list[_RawStepData]) -> None:
 
         # First pass, apply environment variables
         for i, plugin_envvar in enumerate(
-            PluginEnvVar.from_environment(Environment.environ, self)
+            PluginEnvVar.from_environment(Environment.from_environ(), self)
         ):
             debug2(f'environment invocation #{i}', str(plugin_envvar))
 

tmt/steps/context/pidfile.py

@@ -186,8 +186,10 @@ def effective_pidfile_root() -> Path:
     :py:const:`TEST_PIDFILE_ROOT` is picked.
     """
 
-    if 'TMT_TEST_PIDFILE_ROOT' in Environment.environ:
-        return Path(Environment.environ['TMT_TEST_PIDFILE_ROOT'])
+    environment = Environment.from_environ()
+
+    if 'TMT_TEST_PIDFILE_ROOT' in environment:
+        return Path(environment['TMT_TEST_PIDFILE_ROOT'])
 
     return TEST_PIDFILE_ROOT
 

tmt/steps/discover/__init__.py

@@ -286,7 +286,7 @@ def _fetch_remote_source(self, url: str) -> Optional[Path]:
         if self.data.url_content_type == "git":
             self.debug(f"Clone '{url}' to '{self.test_dir}'.")
 
-            environment = Environment.environ
+            environment = Environment.from_environ()
             environment["GIT_ASKPASS"] = EnvVarValue("echo")
 
             tmt.utils.git.git_clone(

tmt/steps/provision/local.py

@@ -336,7 +336,7 @@ def go(self, *, logger: Optional[tmt.log.Logger] = None) -> None:
         self._guest.start()
         self._guest.setup()
 
-        if tmt.utils.Environment.environ.get(tmt.steps.scripts.SCRIPTS_DEST_DIR_VARIABLE):
+        if tmt.utils.Environment.from_environ().get(tmt.steps.scripts.SCRIPTS_DEST_DIR_VARIABLE):
             self.warn(
                 f"The '{tmt.steps.scripts.SCRIPTS_DEST_DIR_VARIABLE}' variable "
                 "is not supported in 'local' provision, the default scripts path "

tmt/steps/scripts.py

@@ -131,7 +131,7 @@ def effective_scripts_dest_dir(default: Path = DEFAULT_SCRIPTS_DEST_DIR) -> Path
     parameter path is returned.
     """
 
-    return Path(tmt.utils.Environment.environ.get(SCRIPTS_DEST_DIR_VARIABLE, default))
+    return Path(tmt.utils.Environment.from_environ().get(SCRIPTS_DEST_DIR_VARIABLE, default))
 
 
 # Script handling reboots, in restraint compatible fashion