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
........

diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py
index ca586268a30fc4c50b092b368ac3b74e8b86ad74..67474025d3a3eaf1d48bfeb1b2da24776678a053 100644 (file)
--- 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 b870bcf0522734dfabb99732bccdb4d6975c0ef0..70ad5e27027bf1c03ea5d3e90061b12aabb53bdd 100644 (file)
--- 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