[Python-checkins] r73008 - in python/trunk: Lib/distutils/tests/test_bdist_dumb.py Lib/distutils/tests/test_dir_util.py Lib/distutils/tests/test_file_util.py Lib/distutils/tests/test_register.py Misc/NEWS

Fri May 29 10:08:07 CEST 2009

Author: tarek.ziade
Date: Fri May 29 10:08:07 2009
New Revision: 73008
Log:
Fixed #6131: test_modulefinder leaked when run after test_distutils
Modified:
 python/trunk/Lib/distutils/tests/test_bdist_dumb.py
 python/trunk/Lib/distutils/tests/test_dir_util.py
 python/trunk/Lib/distutils/tests/test_file_util.py
 python/trunk/Lib/distutils/tests/test_register.py
 python/trunk/Misc/NEWS
Modified: python/trunk/Lib/distutils/tests/test_bdist_dumb.py
==============================================================================

--- python/trunk/Lib/distutils/tests/test_bdist_dumb.py	(original)
+++ python/trunk/Lib/distutils/tests/test_bdist_dumb.py	Fri May 29 10:08:07 2009
@@ -22,16 +22,14 @@
 unittest.TestCase):
 
 def setUp(self):
- support.TempdirManager.setUp(self)
- support.LoggingSilencer.setUp(self)
+ super(BuildDumbTestCase, self).setUp()
 self.old_location = os.getcwd()
 self.old_sys_argv = sys.argv[:]
 
 def tearDown(self):
 os.chdir(self.old_location)
 sys.argv = self.old_sys_argv[:]
- support.LoggingSilencer.tearDown(self)
- support.TempdirManager.tearDown(self)
+ super(BuildDumbTestCase, self).tearDown()
 
 def test_simple_built(self):
 
Modified: python/trunk/Lib/distutils/tests/test_dir_util.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_dir_util.py	(original)
+++ python/trunk/Lib/distutils/tests/test_dir_util.py	Fri May 29 10:08:07 2009
@@ -18,7 +18,7 @@
 self._logs.append(msg)
 
 def setUp(self):
- support.TempdirManager.setUp(self)
+ super(DirUtilTestCase, self).setUp()
 self._logs = []
 tmp_dir = self.mkdtemp()
 self.root_target = os.path.join(tmp_dir, 'deep')
@@ -29,7 +29,7 @@
 
 def tearDown(self):
 log.info = self.old_log
- support.TempdirManager.tearDown(self)
+ super(DirUtilTestCase, self).tearDown()
 
 def test_mkpath_remove_tree_verbosity(self):
 
Modified: python/trunk/Lib/distutils/tests/test_file_util.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_file_util.py	(original)
+++ python/trunk/Lib/distutils/tests/test_file_util.py	Fri May 29 10:08:07 2009
@@ -16,7 +16,7 @@
 self._logs.append(msg)
 
 def setUp(self):
- support.TempdirManager.setUp(self)
+ super(FileUtilTestCase, self).setUp()
 self._logs = []
 self.old_log = log.info
 log.info = self._log
@@ -27,7 +27,7 @@
 
 def tearDown(self):
 log.info = self.old_log
- support.TempdirManager.tearDown(self)
+ super(FileUtilTestCase, self).tearDown()
 
 def test_move_file_verbosity(self):
 f = open(self.source, 'w')
Modified: python/trunk/Lib/distutils/tests/test_register.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_register.py	(original)
+++ python/trunk/Lib/distutils/tests/test_register.py	Fri May 29 10:08:07 2009
@@ -66,7 +66,7 @@
 class RegisterTestCase(PyPIRCCommandTestCase):
 
 def setUp(self):
- PyPIRCCommandTestCase.setUp(self)
+ super(RegisterTestCase, self).setUp()
 # patching the password prompt
 self._old_getpass = getpass.getpass
 def _getpass(prompt):
@@ -78,7 +78,7 @@
 def tearDown(self):
 getpass.getpass = self._old_getpass
 urllib2.build_opener = self.old_opener
- PyPIRCCommandTestCase.tearDown(self)
+ super(RegisterTestCase, self).tearDown()
 
 def _get_cmd(self, metadata=None):
 if metadata is None:
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Fri May 29 10:08:07 2009
@@ -311,6 +311,9 @@
 Library
 -------
 
+- Issue #6131: test_modulefinder leaked when run after test_distutils.
+ Patch by Hirokazu Yamamoto.
+
 - Issue #6048: Now Distutils uses the tarfile module in archive_util.
 
 - Issue #5150: IDLE's format menu now has an option to strip trailing
