Merged revisions 69976 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69976 | tarek.ziade | 2009-02-25 23:29:27 +0100 (Wed, 25 Feb 2009) | 1 line

  Fixed #5316 : test failure in test_site
........

Lib/distutils/tests/test_config.py

@@ -50,7 +50,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
-        support.TempdirManager.setUp(self)
+        super(PyPIRCCommandTestCase, self).setUp()
 
         if 'HOME' in os.environ:
             self._old_home = os.environ['HOME']
@@ -78,7 +78,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
         else:
             os.environ['HOME'] = self._old_home
         set_threshold(self.old_threshold)
-        support.TempdirManager.tearDown(self)
+        super(PyPIRCCommandTestCase, self).tearDown()
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:

Lib/distutils/tests/test_sdist.py

@@ -37,10 +37,9 @@ somecode%(sep)sdoc.txt
 class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
 
     def setUp(self):
-        support.LoggingSilencer.setUp(self)
         # PyPIRCCommandTestCase creates a temp dir already
         # and put it in self.tmp_dir
-        PyPIRCCommandTestCase.setUp(self)
+        super(sdistTestCase, self).setUp()
         # setting up an environment
         self.old_path = os.getcwd()
         os.mkdir(join(self.tmp_dir, 'somecode'))
@@ -54,8 +53,7 @@ class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
     def tearDown(self):
         # back to normal
         os.chdir(self.old_path)
-        PyPIRCCommandTestCase.tearDown(self)
-        support.LoggingSilencer.tearDown(self)
+        super(sdistTestCase, self).tearDown()
 
     def get_cmd(self, metadata=None):
         """Returns a cmd"""

Misc/NEWS

@@ -172,6 +172,8 @@ Core and Builtins
 
 Library
 -------
+- Issue #5316: Fixed buildbot failures introduced by multiple inheritance
+  in Distutils tests.
 
 - Issue #5287: Add exception handling around findCaller() call to help out
   IronPython.