diff options
| -rw-r--r-- | setuptools/tests/test_msvc9compiler.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py index 1c557d39..b2769759 100644 --- a/setuptools/tests/test_msvc9compiler.py +++ b/setuptools/tests/test_msvc9compiler.py @@ -66,13 +66,16 @@ def patch_env(**replacements): for key in replacements if key in os.environ ) - os.environ.update(replacements) # remove values that are null - null_keys = (key for (key, value) in replacements.items() if value is None) - list(map(os.environ.pop, (null_keys))) + remove = (key for (key, value) in replacements.items() if value is None) + for key in list(remove): + os.environ.pop(key, None) + replacements.pop(key) + + os.environ.update(replacements) - yield + yield saved for key in replacements: os.environ.pop(key, None) |