From 46a65a1a635cf3986c853907d1a16c5173cc125d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 19:21:21 -0400
Subject: Always restore os.environ even if an exception occurs.

---
 setuptools/tests/test_msvc9compiler.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'setuptools/tests/test_msvc9compiler.py')

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index ac5e3914..970f7679 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -79,11 +79,12 @@ def patch_env(**replacements):
 
     os.environ.update(replacements)
 
-    yield saved
-
-    for key in replacements:
-        os.environ.pop(key, None)
-    os.environ.update(saved)
+    try:
+        yield saved
+    finally:
+        for key in replacements:
+            os.environ.pop(key, None)
+        os.environ.update(saved)
 
 class TestMSVC9Compiler(unittest.TestCase):
 
-- 
cgit v1.2.1