diff options
| -rw-r--r-- | Lib/distutils/tests/test_bdist_dumb.py | 6 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_dir_util.py | 4 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_file_util.py | 4 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_register.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
5 files changed, 11 insertions, 10 deletions
diff --git a/Lib/distutils/tests/test_bdist_dumb.py b/Lib/distutils/tests/test_bdist_dumb.py index 2863b62..d2ea201 100644 --- 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 6b22f05..0f694aa 100644 --- 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 9373af8..fac4a5d 100644 --- 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 91d3581..0c6bf66 100644 --- 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 urllib2.build_opener = self.old_opener - PyPIRCCommandTestCase.tearDown(self) + super(RegisterTestCase, self).tearDown() def _get_cmd(self, metadata=None): if metadata is None: @@ -311,6 +311,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 #5150: IDLE's format menu now has an option to strip trailing |