#15752: merge with 3.2.

This commit is contained in:
Ezio Melotti 2012-08-21 11:39:47 +03:00
commit b9717b5e02

View file

@ -57,12 +57,12 @@ def test_keys_reuse(self):
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