#9233: Fix json to work properly even when _json is not available.

diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index d606cbd8c0f1159f84c26f640fa9c37eddfc42c1..7b3d7d54a1adb5d3062812cd65cbedb78927e6d2 100644 (file)
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -214,7 +214,7 @@ def JSONObject(s_and_end, strict, scan_once, object_hook, object_pairs_hook,
         pairs = object_hook(pairs)
     return pairs, end
 
-def JSONArray(s_and_end, scan_once, context, _w=WHITESPACE.match):
+def JSONArray(s_and_end, scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
     s, end = s_and_end
     values = []
     nextchar = s[end:end + 1]

diff --git a/Lib/json/scanner.py b/Lib/json/scanner.py
index b4f356146fed58f9513bf23e1f786f0511bbac6c..f94d236149332d1f7782b4d371567ca2cdfbb5fe 100644 (file)
--- a/Lib/json/scanner.py
+++ b/Lib/json/scanner.py
@@ -22,6 +22,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:

diff --git a/Misc/NEWS b/Misc/NEWS
index 021bcf15c2baee00ea1150313befc90d8ce2242d..6a4da30c3fa00171593604670457a977dcb0c3f9 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -51,9 +51,11 @@ Core and Builtins
 Library
 -------
 
-- Issue #11703 - urllib2.geturl() does not return correct url when the original
+- Issue #9233: Fix json to work properly even when _json is not available.
+
+- Issue #11703: urllib2.geturl() does not return correct url when the original
   url contains #fragment.
-  
+
 - Issue #10019: Fixed regression in json module where an indent of 0 stopped
   adding newlines and acted instead like 'None'.