mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 86596 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Ezio Melotti 2010-11-21 01:30:29 +00:00
parent b65b4937e2
commit 19f2aeba67
164 changed files with 2281 additions and 2279 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_descr.py
View file

@ -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):