Merged revisions 73008 via svnmerge from

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

........
  r73008 | tarek.ziade | 2009-05-29 17:08:07 +0900 | 1 line

  Fixed #6131: test_modulefinder leaked when run after test_distutils
........

diff --git a/Lib/distutils/tests/test_bdist_dumb.py b/Lib/distutils/tests/test_bdist_dumb.py
index 2863b620dbd889a0213f2985b0cd36599ce69ede..d2ea201bd49a3f83a706fed7a7d58ac95a3d086f 100644 (file)
--- a/Lib/distutils/tests/test_bdist_dumb.py
+++ b/Lib/distutils/tests/test_bdist_dumb.py
@@ -22,16 +22,14 @@ class BuildDumbTestCase(support.TempdirManager,
                         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):
 

diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
index 6b22f05ff0064baab7886167f03840abc8bd4a88..0f694aa0202a9523a2e4a2513aa89afbd12787c0 100644 (file)
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -18,7 +18,7 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
             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 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def tearDown(self):
         log.info = self.old_log
-        support.TempdirManager.tearDown(self)
+        super(DirUtilTestCase, self).tearDown()
 
     def test_mkpath_remove_tree_verbosity(self):
 

diff --git a/Lib/distutils/tests/test_file_util.py b/Lib/distutils/tests/test_file_util.py
index 9373af8503a96e934e96d3db642313cf68627157..fac4a5d1a9b374f9350eb200b5f050138875af1f 100644 (file)
--- a/Lib/distutils/tests/test_file_util.py
+++ b/Lib/distutils/tests/test_file_util.py
@@ -16,7 +16,7 @@ class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
             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 @@ class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     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')

diff --git a/Lib/distutils/tests/test_register.py b/Lib/distutils/tests/test_register.py
index f486cf797ed3b22815af9e249288bffb1db2f603..d9ff3ec441fd1aca6efb97f6a181c9a28a061d4e 100644 (file)
--- a/Lib/distutils/tests/test_register.py
+++ b/Lib/distutils/tests/test_register.py
@@ -66,7 +66,7 @@ class FakeOpener(object):
 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 @@ class RegisterTestCase(PyPIRCCommandTestCase):
     def tearDown(self):
         getpass.getpass = self._old_getpass
         urllib.request.build_opener = self.old_opener
-        PyPIRCCommandTestCase.tearDown(self)
+        super(RegisterTestCase, self).tearDown()
 
     def _get_cmd(self, metadata=None):
         if metadata is None:

diff --git a/Misc/NEWS b/Misc/NEWS
index 772ca8546a95dc582b89d9d90745bc851e343c94..95c4c4d379df2147b35be0832b36e5d3bbd11809 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -693,6 +693,9 @@ Core and Builtins
 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 #6062: In distutils, fixed the package option of build_ext. Feedback