diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-20 19:04:17 (GMT) | 
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-20 19:04:17 (GMT) | 
| commit | b3aedd48621ed9d33b5f42f946b256bce4a50673 (patch) | |
| tree | 2297c8ebce1b09621e1d98096c1603896d9a0f0c /Lib/json/tests/test_scanstring.py | |
| parent | b8bc439b2093add9b313bcca2cc507a2d0e87764 (diff) | |
| download | cpython-b3aedd48621ed9d33b5f42f946b256bce4a50673.zip cpython-b3aedd48621ed9d33b5f42f946b256bce4a50673.tar.gz cpython-b3aedd48621ed9d33b5f42f946b256bce4a50673.tar.bz2 | |
#9424: Replace deprecated assert* methods in the Python test suite.
Diffstat (limited to 'Lib/json/tests/test_scanstring.py')
| -rw-r--r-- | Lib/json/tests/test_scanstring.py | 44 | 
1 files changed, 22 insertions, 22 deletions
| diff --git a/Lib/json/tests/test_scanstring.py b/Lib/json/tests/test_scanstring.py index 2e9136b..d503851 100644 --- a/Lib/json/tests/test_scanstring.py +++ b/Lib/json/tests/test_scanstring.py @@ -14,92 +14,92 @@ class TestScanString(TestCase):              self._test_scanstring(json.decoder.c_scanstring)      def _test_scanstring(self, scanstring): -        self.assertEquals( +        self.assertEqual(              scanstring('"z\\ud834\\udd20x"', 1, True),              ('z\U0001d120x', 16))          if sys.maxunicode == 65535: -            self.assertEquals( +            self.assertEqual(                  scanstring('"z\U0001d120x"', 1, True),                  ('z\U0001d120x', 6))          else: -            self.assertEquals( +            self.assertEqual(                  scanstring('"z\U0001d120x"', 1, True),                  ('z\U0001d120x', 5)) -        self.assertEquals( +        self.assertEqual(              scanstring('"\\u007b"', 1, True),              ('{', 8)) -        self.assertEquals( +        self.assertEqual(              scanstring('"A JSON payload should be an object or array, not a string."', 1, True),              ('A JSON payload should be an object or array, not a string.', 60)) -        self.assertEquals( +        self.assertEqual(              scanstring('["Unclosed array"', 2, True),              ('Unclosed array', 17)) -        self.assertEquals( +        self.assertEqual(              scanstring('["extra comma",]', 2, True),              ('extra comma', 14)) -        self.assertEquals( +        self.assertEqual(              scanstring('["double extra comma",,]', 2, True),              ('double extra comma', 21)) -        self.assertEquals( +        self.assertEqual(              scanstring('["Comma after the close"],', 2, True),              ('Comma after the close', 24)) -        self.assertEquals( +        self.assertEqual(              scanstring('["Extra close"]]', 2, True),              ('Extra close', 14)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Extra comma": true,}', 2, True),              ('Extra comma', 14)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Extra value after close": true} "misplaced quoted value"', 2, True),              ('Extra value after close', 26)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Illegal expression": 1 + 2}', 2, True),              ('Illegal expression', 21)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Illegal invocation": alert()}', 2, True),              ('Illegal invocation', 21)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Numbers cannot have leading zeroes": 013}', 2, True),              ('Numbers cannot have leading zeroes', 37)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Numbers cannot be hex": 0x14}', 2, True),              ('Numbers cannot be hex', 24)) -        self.assertEquals( +        self.assertEqual(              scanstring('[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]', 21, True),              ('Too deep', 30)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Missing colon" null}', 2, True),              ('Missing colon', 16)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Double colon":: null}', 2, True),              ('Double colon', 15)) -        self.assertEquals( +        self.assertEqual(              scanstring('{"Comma instead of colon", null}', 2, True),              ('Comma instead of colon', 25)) -        self.assertEquals( +        self.assertEqual(              scanstring('["Colon instead of comma": false]', 2, True),              ('Colon instead of comma', 25)) -        self.assertEquals( +        self.assertEqual(              scanstring('["Bad value", truth]', 2, True),              ('Bad value', 12)) | 
