diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-08-21 08:39:47 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-08-21 08:39:47 (GMT) |
| commit | b9717b5e022086c057f5c19b7a124a7800aa052a (patch) | |
| tree | a0f09579af5952fd78b74735170b418801a91d19 /Lib | |
| parent | 83c0ae5de642145ec225d29e7b239aa410229539 (diff) | |
| parent | 1b47bf43a6328e98849ccc7fe0375966b5571452 (diff) | |
| download | cpython-b9717b5e022086c057f5c19b7a124a7800aa052a.zip cpython-b9717b5e022086c057f5c19b7a124a7800aa052a.tar.gz cpython-b9717b5e022086c057f5c19b7a124a7800aa052a.tar.bz2 | |
#15752: merge with 3.2.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/json_tests/test_decode.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/json_tests/test_decode.py b/Lib/test/json_tests/test_decode.py index 4f7896e..0a55a33 100644 --- a/Lib/test/json_tests/test_decode.py +++ b/Lib/test/json_tests/test_decode.py @@ -57,12 +57,12 @@ class TestDecode: def test_extra_data(self): s = '[1, 2, 3]5' msg = 'Extra data' - self.assertRaisesRegexp(ValueError, msg, self.loads, s) + self.assertRaisesRegex(ValueError, msg, self.loads, s) def test_invalid_escape(self): s = '["abc\\y"]' msg = 'escape' - self.assertRaisesRegexp(ValueError, msg, self.loads, s) + self.assertRaisesRegex(ValueError, msg, self.loads, s) class TestPyDecode(TestDecode, PyTest): pass class TestCDecode(TestDecode, CTest): pass |