Issue 5381: fix regression in pure python code path, Issue 5584: fix a decoder bug...

diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
index 01c26d9f602132e8f5e30c88e748d6e3b510263b..ba584a35241e02ebe2be7c3585a901517bba2101 100644 (file)
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -266,7 +266,8 @@ def load(fp, encoding=None, cls=None, object_hook=None, parse_float=None,
     return loads(fp.read(),
         encoding=encoding, cls=cls, object_hook=object_hook,
         parse_float=parse_float, parse_int=parse_int,
-        parse_constant=parse_constant, object_pairs_hook=None, **kw)
+        parse_constant=parse_constant, object_pairs_hook=object_pairs_hook,
+        **kw)
 
 
 def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None,

diff --git a/Lib/json/scanner.py b/Lib/json/scanner.py
index 00c5470d0c93c1de7d1e1fdc340026b0e4dac0cb..74e6805155d85399fd5a6a67d5b35765270f63db 100644 (file)
--- a/Lib/json/scanner.py
+++ b/Lib/json/scanner.py
@@ -23,6 +23,7 @@ def py_make_scanner(context):
     parse_int = context.parse_int
     parse_constant = context.parse_constant
     object_hook = context.object_hook
+    object_pairs_hook = context.object_pairs_hook
 
     def _scan_once(string, idx):
         try:
@@ -34,7 +35,7 @@ def py_make_scanner(context):
             return parse_string(string, idx + 1, encoding, strict)
         elif nextchar == '{':
             return parse_object((string, idx + 1), encoding, strict,
-                _scan_once, object_hook)
+                _scan_once, object_hook, object_pairs_hook)
         elif nextchar == '[':
             return parse_array((string, idx + 1), _scan_once)
         elif nextchar == 'n' and string[idx:idx + 4] == 'null':

diff --git a/Lib/json/tests/test_decode.py b/Lib/json/tests/test_decode.py
index 0744b52b24695bb518a74856efbc3841af964ff0..71095271f129939633abf298b773dc5e8d7f5961 100644 (file)
--- a/Lib/json/tests/test_decode.py
+++ b/Lib/json/tests/test_decode.py
@@ -1,5 +1,6 @@
 import decimal
 from unittest import TestCase
+from StringIO import StringIO
 
 import json
 from collections import OrderedDict
@@ -27,12 +28,14 @@ class TestDecode(TestCase):
         p = [("xkd", 1), ("kcw", 2), ("art", 3), ("hxm", 4),
              ("qrt", 5), ("pad", 6), ("hoy", 7)]
         self.assertEqual(json.loads(s), eval(s))
-        self.assertEqual(json.loads(s, object_pairs_hook = lambda x: x), p)
-        od = json.loads(s, object_pairs_hook = OrderedDict)
+        self.assertEqual(json.loads(s, object_pairs_hook=lambda x: x), p)
+        self.assertEqual(json.load(StringIO(s),
+                                   object_pairs_hook=lambda x: x), p)
+        od = json.loads(s, object_pairs_hook=OrderedDict)
         self.assertEqual(od, OrderedDict(p))
         self.assertEqual(type(od), OrderedDict)
         # the object_pairs_hook takes priority over the object_hook
         self.assertEqual(json.loads(s,
-                                    object_pairs_hook = OrderedDict,
-                                    object_hook = lambda x: None),
+                                    object_pairs_hook=OrderedDict,
+                                    object_hook=lambda x: None),
                          OrderedDict(p))

diff --git a/Lib/json/tests/test_float.py b/Lib/json/tests/test_float.py
index 20d41d9b191da4e78cf6ec357ee678c09821dba1..15e791397a75461ee32c09120ef381778983516e 100644 (file)
--- a/Lib/json/tests/test_float.py
+++ b/Lib/json/tests/test_float.py
@@ -5,11 +5,15 @@ import json
 
 class TestFloat(TestCase):
     def test_floats(self):
-        for num in [1617161771.7650001, math.pi, math.pi**100, math.pi**-100, 3.1]:
+        for num in [1617161771.7650001, math.pi, math.pi**100,
+                    math.pi**-100, 3.1]:
             self.assertEquals(float(json.dumps(num)), num)
             self.assertEquals(json.loads(json.dumps(num)), num)
+            self.assertEquals(json.loads(unicode(json.dumps(num))), num)
 
     def test_ints(self):
         for num in [1, 1L, 1<<32, 1<<64]:
             self.assertEquals(json.dumps(num), str(num))
             self.assertEquals(int(json.dumps(num)), num)
+            self.assertEquals(json.loads(json.dumps(num)), num)
+            self.assertEquals(json.loads(unicode(json.dumps(num))), num)

diff --git a/Modules/_json.c b/Modules/_json.c
index 0354a9b5fa8c967d89c62193983a80c1a5119e6a..0e3046948e212de982b9dff66d3b918b38faf23d 100644 (file)
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1468,7 +1468,7 @@ _match_number_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_
     if (idx < end_idx && str[idx] == '.' && str[idx + 1] >= '0' && str[idx + 1] <= '9') {
         is_float = 1;
         idx += 2;
-        while (idx < end_idx && str[idx] >= '0' && str[idx] <= '9') idx++;
+        while (idx <= end_idx && str[idx] >= '0' && str[idx] <= '9') idx++;
     }
 
     /* if the next char is 'e' or 'E' then maybe read the exponent (or backtrack) */