merge 3.3

This commit is contained in:
Benjamin Peterson 2014-04-13 22:31:42 -04:00
commit 584f5cbf16
4 changed files with 12 additions and 1 deletions

View file

@ -91,5 +91,9 @@ class TestDecode:
self.assertEqual(self.loads(bom_in_str), '\ufeff')
self.assertEqual(self.json.load(StringIO(bom_in_str)), '\ufeff')
def test_negative_index(self):
d = self.json.JSONDecoder()
self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000)
class TestPyDecode(TestDecode, PyTest): pass
class TestCDecode(TestDecode, CTest): pass