From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Sat, 9 May 2009 10:09:11 +0000 (+0000)
Subject: Merged revisions 72500 via svnmerge from
X-Git-Tag: v3.1rc1~202
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be5b1b99737271a1f7d9748203b7ee116dd0ce61;p=python

Merged revisions 72500 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72500 | tarek.ziade | 2009-05-09 12:06:00 +0200 (Sat, 09 May 2009) | 1 line

  #5976: fixed distutils test_check_environ
........
---

diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py
index 348933e901..ea7c5925b7 100644
--- a/Lib/distutils/tests/test_util.py
+++ b/Lib/distutils/tests/test_util.py
@@ -214,12 +214,17 @@ class utilTestCase(unittest.TestCase):
 
         # posix without HOME
         if os.name == 'posix':  # this test won't run on windows
-            os.environ = {}
-            check_environ()
-
-            import pwd
-            self.assertEquals(os.environ['HOME'],
-                              pwd.getpwuid(os.getuid())[5])
+            old_home = os.environ.get('HOME')
+            try:
+                check_environ()
+                import pwd
+                self.assertEquals(os.environ['HOME'],
+                                  pwd.getpwuid(os.getuid())[5])
+            finally:
+                if old_home is not None:
+                    os.environ['HOME'] = old_home
+                else:
+                    del os.environ['HOME']
         else:
             check_environ()
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 43abc90af2..1800a3ad4f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -581,6 +581,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #5976: Fixed Distutils test_check_environ.
+
 - Issue #5941: Distutils build_clib command was not working anymore because
   of an incomplete costumization of the archiver command. Added ARFLAGS in the
   Makefile besides AR and make Distutils use it. Original patch by David