diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 01:30:29 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 01:30:29 (GMT) |
| commit | 19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee (patch) | |
| tree | 596b5a2c45b058ea3e0cdc49cb7539a21410b98d /Lib/test/test_descr.py | |
| parent | b65b4937e20be4a2d3311326909c77bbf2e1c4cd (diff) | |
| download | cpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.zip cpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.tar.gz cpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.tar.bz2 | |
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/test/test_descr.py')
| -rw-r--r-- | Lib/test/test_descr.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 320a7a7..9c26ed3 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4205,11 +4205,11 @@ order (MRO) for bases """ __getattr__ = descr self.assertRaises(AttributeError, getattr, A(), "attr") - self.assertEquals(descr.counter, 1) + self.assertEqual(descr.counter, 1) self.assertRaises(AttributeError, getattr, B(), "attr") - self.assertEquals(descr.counter, 2) + self.assertEqual(descr.counter, 2) self.assertRaises(AttributeError, getattr, C(), "attr") - self.assertEquals(descr.counter, 4) + self.assertEqual(descr.counter, 4) import gc class EvilGetattribute(object): @@ -4236,7 +4236,7 @@ class DictProxyTests(unittest.TestCase): # Testing dict-proxy iterkeys... keys = [ key for key in self.C.__dict__.keys() ] keys.sort() - self.assertEquals(keys, ['__dict__', '__doc__', '__module__', + self.assertEqual(keys, ['__dict__', '__doc__', '__module__', '__weakref__', 'meth']) def test_iter_values(self): |