[Python-checkins] cpython (3.2): Issue #15615: Add some tests for the json module's handling of invalid input

[antoine.pitrou]

http://hg.python.org/cpython/rev/cd9a4883dd02
changeset:   78643:cd9a4883dd02
branch:      3.2
parent:      78640:08418369da7b
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Aug 18 20:46:23 2012 +0200
summary:
  Issue #15615: Add some tests for the json module's handling of invalid input data.
Patch by Kushal Das.

files:
  Lib/test/json_tests/test_decode.py |  9 +++++++++
  Misc/ACKS                          |  1 +
  Misc/NEWS                          |  3 +++
  3 files changed, 13 insertions(+), 0 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
@@ -54,6 +54,15 @@
         self.check_keys_reuse(s, self.loads)
         self.check_keys_reuse(s, self.json.decoder.JSONDecoder().decode)
 
+    def test_extra_data(self):
+        s = '[1, 2, 3]5'
+        msg = 'Extra data'
+        self.assertRaisesRegexp(ValueError, msg, self.loads, s)
+
+    def test_invalid_escape(self):
+        s = '["abc\\y"]'
+        msg = 'escape'
+        self.assertRaisesRegexp(ValueError, msg, self.loads, s)
 
 class TestPyDecode(TestDecode, PyTest): pass
 class TestCDecode(TestDecode, CTest): pass
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -218,6 +218,7 @@
 Eric Daniel
 Scott David Daniels
 Ben Darnell
+Kushal Das
 Jonathan Dasteel
 John DeGood
 Ned Deily
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -425,6 +425,9 @@
 Tests
 -----
 
+- Issue #15615: Add some tests for the json module's handling of invalid
+  input data.  Patch by Kushal Das.
+
 - Issue #15496: Add directory removal helpers for tests on Windows.
   Patch by Jeremy Kloth.
 

-- 
Repository URL: http://hg.python.org/cpython