commit c753305180db1e24029be7cfc4d8774167876c00
author Ezio Melotti <none@none> Wed Apr 13 07:04:18 2011 +0300
committer Ezio Melotti <none@none> Wed Apr 13 07:04:18 2011 +0300
tree a332efb9863dcff3cb01b574185efb7b3277743e
parent 4f95a52fe24cd136da5634747d5334c86d400d2d

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

Lib/json/decoder.py

diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index d606cbd..7b3d7d5 100644
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -214,7 +214,7 @@
         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]

Lib/json/scanner.py

diff --git a/Lib/json/scanner.py b/Lib/json/scanner.py
index b4f3561..f94d236 100644
--- a/Lib/json/scanner.py
+++ b/Lib/json/scanner.py
@@ -22,6 +22,7 @@
     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: