diff options
Diffstat (limited to 'Lib/test/test_coercion.py')
| -rw-r--r-- | Lib/test/test_coercion.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Lib/test/test_coercion.py b/Lib/test/test_coercion.py index 0ca00a6..2b55c41 100644 --- a/Lib/test/test_coercion.py +++ b/Lib/test/test_coercion.py @@ -266,9 +266,9 @@ class CoercionTest(unittest.TestCase): self.assertRaises(TypeError, eval, 'a %s b' % op, {'a': a, 'b': b}) else: - self.assertEquals(format_result(res), - format_result(eval('a %s b' % op)), - '%s %s %s == %s failed' % (a, op, b, res)) + self.assertEqual(format_result(res), + format_result(eval('a %s b' % op)), + '%s %s %s == %s failed' % (a, op, b, res)) try: z = copy.copy(a) except copy.Error: @@ -282,7 +282,7 @@ class CoercionTest(unittest.TestCase): self.fail("TypeError not raised") else: exec('z %s= b' % op) - self.assertEquals(ires, z) + self.assertEqual(ires, z) def test_prefix_binops(self): for ia, a in enumerate(candidates): @@ -293,9 +293,9 @@ class CoercionTest(unittest.TestCase): self.assertRaises(TypeError, eval, '%s(a, b)' % op, {'a': a, 'b': b}) else: - self.assertEquals(format_result(res), - format_result(eval('%s(a, b)' % op)), - '%s(%s, %s) == %s failed' % (op, a, b, res)) + self.assertEqual(format_result(res), + format_result(eval('%s(a, b)' % op)), + '%s(%s, %s) == %s failed' % (op, a, b, res)) def test_cmptypes(self): # Built-in tp_compare slots expect their arguments to have the @@ -303,21 +303,21 @@ class CoercionTest(unittest.TestCase): # SF #980352 evil_coercer = CoerceTo(42) # Make sure these don't crash any more - self.assertNotEquals(cmp(u'fish', evil_coercer), 0) - self.assertNotEquals(cmp(slice(1), evil_coercer), 0) + self.assertNotEqual(cmp(u'fish', evil_coercer), 0) + self.assertNotEqual(cmp(slice(1), evil_coercer), 0) # ...but that this still works class WackyComparer(object): def __cmp__(slf, other): self.assertTrue(other == 42, 'expected evil_coercer, got %r' % other) return 0 __hash__ = None # Invalid cmp makes this unhashable - self.assertEquals(cmp(WackyComparer(), evil_coercer), 0) + self.assertEqual(cmp(WackyComparer(), evil_coercer), 0) # ...and classic classes too, since that code path is a little different class ClassicWackyComparer: def __cmp__(slf, other): self.assertTrue(other == 42, 'expected evil_coercer, got %r' % other) return 0 - self.assertEquals(cmp(ClassicWackyComparer(), evil_coercer), 0) + self.assertEqual(cmp(ClassicWackyComparer(), evil_coercer), 0) def test_infinite_rec_classic_classes(self): # if __coerce__() returns its arguments reversed it causes an infinite |