Fixed #5316 : test failure in test_site
diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py
index d812769..a18f453 100644
--- a/Lib/distutils/tests/test_config.py
+++ b/Lib/distutils/tests/test_config.py
@@ -51,7 +51,7 @@
def setUp(self):
"""Patches the environment."""
- support.TempdirManager.setUp(self)
+ super(PyPIRCCommandTestCase, self).setUp()
if os.environ.has_key('HOME'):
self._old_home = os.environ['HOME']
@@ -79,7 +79,7 @@
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:
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index 9c579b4..15a8c80 100644
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -37,10 +37,9 @@
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 @@
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"""
diff --git a/Misc/NEWS b/Misc/NEWS
index 7787203..77fa493 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -165,6 +165,9 @@
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.