Allow to unset more than one env var at once.

python · picnixz · Mar 16, 2025 · Mar 15, 2025 · Mar 15, 2025 · Mar 15, 2025
commit 09c4aae7cb7ff89da690ce06e38662bcee3917c5
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
@@ -1435,9 +1435,12 @@ The :mod:`test.support.os_helper` module provides support for os tests.
   ``value``.


-.. method:: EnvironmentVarGuard.unset(envvar)
+.. method:: EnvironmentVarGuard.unset(envvar, *others)

-   Temporarily unset the environment variable ``envvar``.
+   Temporarily unset one or more environment variables.
+
+   .. versionchanged:: next
+      More than one environment variable can be unset.


 .. function:: can_symlink()

diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
@@ -720,9 +720,10 @@ def temp_umask(umask):


 class EnvironmentVarGuard(collections.abc.MutableMapping):
+    """Class to help protect the environment variable properly.

-    """Class to help protect the environment variable properly.  Can be used as
-    a context manager."""
+    Can be used as a context manager.
+    """

    def __init__(self):
        self._environ = os.environ
@@ -756,8 +757,10 @@ def __len__(self):
    def set(self, envvar, value):
        self[envvar] = value

-    def unset(self, envvar):
-        del self[envvar]
+    def unset(self, envvar, /, *envvars):
+        """Unset one or more known environment variables."""
+        for ev in (envvar, *envvars):
+            del self[ev]

    def copy(self):
        # We do what os.environ.copy() does.