diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py index 29be0cfd2dc..348933e901c 100644 --- a/Lib/distutils/tests/test_util.py +++ b/Lib/distutils/tests/test_util.py @@ -29,7 +29,7 @@ def setUp(self): self.platform = sys.platform self.version = sys.version self.sep = os.sep - self.environ = os.environ + self.environ = dict(os.environ) self.join = os.path.join self.isabs = os.path.isabs self.splitdrive = os.path.splitdrive @@ -51,7 +51,10 @@ def tearDown(self): sys.platform = self.platform sys.version = self.version os.sep = self.sep - os.environ = self.environ + for k, v in self.environ.items(): + os.environ[k] = v + for k in set(os.environ) - set(self.environ): + del os.environ[k] os.path.join = self.join os.path.isabs = self.isabs os.path.splitdrive = self.splitdrive diff --git a/Misc/NEWS b/Misc/NEWS index c3a965af702..e647965cfdd 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -437,6 +437,8 @@ Core and Builtins Library ------- +- Issue #4951: Fixed failure in test_httpservers. + - Issue #5795: Fixed test_distutils failure on Debian ppc. - Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries.