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.
........
diff --git a/Lib/test/test_class.py b/Lib/test/test_class.py
index e7b7752..0f25101 100644
--- a/Lib/test/test_class.py
+++ b/Lib/test/test_class.py
@@ -475,7 +475,7 @@
del testme
import gc
gc.collect()
- self.assertEquals(["crab people, crab people"], x)
+ self.assertEqual(["crab people, crab people"], x)
def testBadTypeReturned(self):
# return values of some method are type-checked
@@ -507,14 +507,14 @@
callLst[:] = []
as_int = int(mixIntAndLong)
- self.assertEquals(type(as_int), long)
- self.assertEquals(as_int, 42L)
+ self.assertEqual(type(as_int), long)
+ self.assertEqual(as_int, 42L)
self.assertCallStack([('__int__', (mixIntAndLong,))])
callLst[:] = []
as_long = long(mixIntAndLong)
- self.assertEquals(type(as_long), long)
- self.assertEquals(as_long, 64)
+ self.assertEqual(type(as_long), long)
+ self.assertEqual(as_long, 64)
self.assertCallStack([('__long__', (mixIntAndLong,))])
def testHashStuff(self):
@@ -599,17 +599,17 @@
a1 = A(1)
a2 = A(2)
- self.assertEquals(a1.f, a1.f)
- self.assertNotEquals(a1.f, a2.f)
- self.assertNotEquals(a1.f, a1.g)
- self.assertEquals(a1.f, A(1).f)
- self.assertEquals(hash(a1.f), hash(a1.f))
- self.assertEquals(hash(a1.f), hash(A(1).f))
+ self.assertEqual(a1.f, a1.f)
+ self.assertNotEqual(a1.f, a2.f)
+ self.assertNotEqual(a1.f, a1.g)
+ self.assertEqual(a1.f, A(1).f)
+ self.assertEqual(hash(a1.f), hash(a1.f))
+ self.assertEqual(hash(a1.f), hash(A(1).f))
- self.assertNotEquals(A.f, a1.f)
- self.assertNotEquals(A.f, A.g)
- self.assertEquals(B.f, A.f)
- self.assertEquals(hash(B.f), hash(A.f))
+ self.assertNotEqual(A.f, a1.f)
+ self.assertNotEqual(A.f, A.g)
+ self.assertEqual(B.f, A.f)
+ self.assertEqual(hash(B.f), hash(A.f))
# the following triggers a SystemError in 2.4
a = A(hash(A.f.im_func)^(-1))