diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 01:30:29 +0000 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 01:30:29 +0000 |
| commit | 19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee (patch) | |
| tree | 596b5a2c45b058ea3e0cdc49cb7539a21410b98d /Lib/unittest.py | |
| parent | b65b4937e20be4a2d3311326909c77bbf2e1c4cd (diff) | |
| download | cpython-git-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.tar.gz | |
Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
Diffstat (limited to 'Lib/unittest.py')
| -rw-r--r-- | Lib/unittest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/unittest.py b/Lib/unittest.py index ea9f5f64fb..9f5cea5e8b 100644 --- a/Lib/unittest.py +++ b/Lib/unittest.py @@ -881,8 +881,8 @@ class TestCase(object): self.fail(self._formatMessage(msg, standardMsg)) def assertDictEqual(self, d1, d2, msg=None): - self.assert_(isinstance(d1, dict), 'First argument is not a dictionary') - self.assert_(isinstance(d2, dict), 'Second argument is not a dictionary') + self.assertTrue(isinstance(d1, dict), 'First argument is not a dictionary') + self.assertTrue(isinstance(d2, dict), 'Second argument is not a dictionary') if d1 != d2: standardMsg = ('\n' + '\n'.join(difflib.ndiff( @@ -949,9 +949,9 @@ class TestCase(object): def assertMultiLineEqual(self, first, second, msg=None): """Assert that two multi-line strings are equal.""" - self.assert_(isinstance(first, str), ( + self.assertTrue(isinstance(first, str), ( 'First argument is not a string')) - self.assert_(isinstance(second, str), ( + self.assertTrue(isinstance(second, str), ( 'Second argument is not a string')) if first != second: |