diff -r 517f3432d1b5 Lib/test/test_importlib/import_/test_fromlist.py --- a/Lib/test/test_importlib/import_/test_fromlist.py Tue Dec 25 15:27:56 2012 -0800 +++ b/Lib/test/test_importlib/import_/test_fromlist.py Thu Dec 27 18:42:56 2012 +0200 @@ -80,7 +80,7 @@ with util.import_state(meta_path=[importer]): with self.assertRaises(ImportError) as exc: import_util.import_('pkg', fromlist=['mod']) - self.assertEquals('i_do_not_exist', exc.exception.name) + self.assertEqual('i_do_not_exist', exc.exception.name) def test_empty_string(self): with util.mock_modules('pkg.__init__', 'pkg.mod') as importer: diff -r 517f3432d1b5 Lib/test/test_int.py --- a/Lib/test/test_int.py Tue Dec 25 15:27:56 2012 -0800 +++ b/Lib/test/test_int.py Thu Dec 27 18:42:56 2012 +0200 @@ -222,23 +222,23 @@ self.assertEqual(int('1z141z5', 36), 4294967297) def test_no_args(self): - self.assertEquals(int(), 0) + self.assertEqual(int(), 0) def test_keyword_args(self): # Test invoking int() using keyword arguments. - self.assertEquals(int(x=1.2), 1) - self.assertEquals(int('100', base=2), 4) - self.assertEquals(int(x='100', base=2), 4) + self.assertEqual(int(x=1.2), 1) + self.assertEqual(int('100', base=2), 4) + self.assertEqual(int(x='100', base=2), 4) # For example, PyPy 1.9.0 raised TypeError for these cases because it # expects x to be a string if base is given. @support.cpython_only def test_base_arg_with_no_x_arg(self): - self.assertEquals(int(base=6), 0) + self.assertEqual(int(base=6), 0) # Even invalid bases don't raise an exception. - self.assertEquals(int(base=1), 0) - self.assertEquals(int(base=1000), 0) - self.assertEquals(int(base='foo'), 0) + self.assertEqual(int(base=1), 0) + self.assertEqual(int(base=1000), 0) + self.assertEqual(int(base='foo'), 0) def test_non_numeric_input_types(self): # Test possible non-numeric types for the argument x, including @@ -255,8 +255,8 @@ for x in values: msg = 'x has type %s' % type(x).__name__ - self.assertEquals(int(x), 100, msg=msg) - self.assertEquals(int(x, 2), 4, msg=msg) + self.assertEqual(int(x), 100, msg=msg) + self.assertEqual(int(x, 2), 4, msg=msg) def test_string_float(self): self.assertRaises(ValueError, int, '1.2')