From 23336083d3ad050d6389d4696147e4e0c71536cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= Date: Sat, 25 Apr 2009 12:39:56 +0000 Subject: Merged revisions 71878 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r71878 | tarek.ziade | 2009-04-25 14:38:08 +0200 (Sat, 25 Apr 2009) | 1 line Issue #4951: Fixed failure in test_httpservers ........ --- Lib/distutils/tests/test_util.py | 7 +++++-- Misc/NEWS | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py index 29be0cf..348933e 100644 --- a/Lib/distutils/tests/test_util.py +++ b/Lib/distutils/tests/test_util.py @@ -29,7 +29,7 @@ class utilTestCase(unittest.TestCase): 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 @@ class utilTestCase(unittest.TestCase): 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 c3a965a..e647965 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. -- cgit v0.12