From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Wed, 11 Mar 2009 12:52:00 +0000 (+0000)
Subject: Merged revisions 70308 via svnmerge from
X-Git-Tag: v3.1a2~283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=516db94459a8e711aaf8d6d8783463c64530f8fa;p=python

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 ca586268a3..67474025d3 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 b870bcf052..70ad5e2702 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