[Python-checkins] cpython (3.3): Issue #16793. Replace deprecated unittest asserts with modern counterparts.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/6601818622ea
changeset:   81110:6601818622ea
branch:      3.3
parent:      81107:dee82e66726d
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Dec 28 00:34:57 2012 +0200
summary:
  Issue #16793. Replace deprecated unittest asserts with modern counterparts.

files:
  Lib/test/test_importlib/import_/test_fromlist.py |   2 +-
  Lib/test/test_int.py                             |  20 +++++-----
  2 files changed, 11 insertions(+), 11 deletions(-)


diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py
--- a/Lib/test/test_importlib/import_/test_fromlist.py
+++ b/Lib/test/test_importlib/import_/test_fromlist.py
@@ -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 --git a/Lib/test/test_int.py b/Lib/test/test_int.py
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -226,23 +226,23 @@
         self.assertIs(int(b'-1'), -1)
 
     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
@@ -259,8 +259,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')

-- 
Repository URL: http://hg.python.org/cpython