summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-03-11 12:52:00 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-03-11 12:52:00 (GMT)
commit516db94459a8e711aaf8d6d8783463c64530f8fa (patch)
tree431f0e786041dd7deabf85df316eadafc13c44f3
parentc59cd688470eca51c24f5084cc7b9800447f4c94 (diff)
downloadcpython-516db94459a8e711aaf8d6d8783463c64530f8fa.zip
cpython-516db94459a8e711aaf8d6d8783463c64530f8fa.tar.gz
cpython-516db94459a8e711aaf8d6d8783463c64530f8fa.tar.bz2
Merged revisions 70308 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70308 | tarek.ziade | 2009-03-11 13:48:04 +0100 (Wed, 11 Mar 2009) | 1 line Issue #5472: Fixed distutils.test_util tear down ........
-rw-r--r--Lib/distutils/tests/test_util.py2
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py
index ca58626..6747402 100644
--- a/Lib/distutils/tests/test_util.py
+++ b/Lib/distutils/tests/test_util.py
@@ -53,6 +53,8 @@ class utilTestCase(unittest.TestCase):
os.path.splitdrive = self.splitdrive
if self.uname is not None:
os.uname = self.uname
+ else:
+ del os.uname
def _set_uname(self, uname):
self._uname = uname
diff --git a/Misc/NEWS b/Misc/NEWS
index b870bcf..70ad5e2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -195,6 +195,9 @@ Core and Builtins
Library
-------
+- Issue #5472: Fixed distutils.test_util tear down. Original patch by
+ Tim Golden.
+
- collections.deque() objects now have a read-only attribute called maxlen.
- Issue #2638: Show a window constructed with tkSimpleDialog.Dialog only after