commit b9717b5e022086c057f5c19b7a124a7800aa052a
author Ezio Melotti <ezio.melotti@gmail.com> Tue Aug 21 11:39:47 2012 +0300
committer Ezio Melotti <ezio.melotti@gmail.com> Tue Aug 21 11:39:47 2012 +0300
tree a0f09579af5952fd78b74735170b418801a91d19
parent 83c0ae5de642145ec225d29e7b239aa410229539
parent 1b47bf43a6328e98849ccc7fe0375966b5571452

#15752: merge with 3.2.

Lib/test/json_tests/test_decode.py

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 @@
     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