[Python-checkins] r71879 - in python/branches/py3k: Lib/distutils/tests/test_util.py Misc/NEWS
tarek.ziade
python-checkins at python.org
Sat Apr 25 14:39:56 CEST 2009
Author: tarek.ziade
Date: Sat Apr 25 14:39:56 2009
New Revision: 71879
Log:
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
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/tests/test_util.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/distutils/tests/test_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_util.py (original)
+++ python/branches/py3k/Lib/distutils/tests/test_util.py Sat Apr 25 14:39:56 2009
@@ -29,7 +29,7 @@
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 @@
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
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Sat Apr 25 14:39:56 2009
@@ -437,6 +437,8 @@
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.
More information about the Python-checkins
mailing list