[Python-checkins] cpython (merge 3.2 -> default): #15752: merge with 3.2.

Tue Aug 21 10:40:08 CEST 2012

http://hg.python.org/cpython/rev/b36ce0a3a844
changeset: 78696:b36ce0a3a844
parent: 78694:28f424022c6e
parent: 78695:3a02a1f7d069
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue Aug 21 11:39:47 2012 +0300
summary:
 #15752: merge with 3.2.
files:
 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
--- 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
-- 
Repository URL: http://hg.python.org/cpython
