[Python-checkins] r69977 - in python/branches/py3k: Lib/distutils/tests/test_config.py Lib/distutils/tests/test_sdist.py Misc/NEWS
tarek.ziade
python-checkins at python.org
Wed Feb 25 23:31:38 CET 2009
Author: tarek.ziade
Date: Wed Feb 25 23:31:38 2009
New Revision: 69977
Log:
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
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/tests/test_config.py
python/branches/py3k/Lib/distutils/tests/test_sdist.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/distutils/tests/test_config.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_config.py (original)
+++ python/branches/py3k/Lib/distutils/tests/test_config.py Wed Feb 25 23:31:38 2009
@@ -50,7 +50,7 @@
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 @@
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:
Modified: python/branches/py3k/Lib/distutils/tests/test_sdist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_sdist.py (original)
+++ python/branches/py3k/Lib/distutils/tests/test_sdist.py Wed Feb 25 23:31:38 2009
@@ -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"""
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Wed Feb 25 23:31:38 2009
@@ -172,6 +172,8 @@
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.
More information about the Python-checkins
mailing list