[Python-checkins] r70310 - in python/branches/py3k: Lib/distutils/tests/test_util.py Misc/NEWS

[tarek.ziade]

Author: tarek.ziade
Date: Wed Mar 11 13:52:00 2009
New Revision: 70310

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


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	Wed Mar 11 13:52:00 2009
@@ -53,6 +53,8 @@
         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

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed Mar 11 13:52:00 2009
@@ -195,6 +195,9 @@
 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