diff options
| -rw-r--r-- | Lib/distutils/tests/test_util.py | 17 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 13 insertions, 6 deletions
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() @@ -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 |