From c753305180db1e24029be7cfc4d8774167876c00 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <none@none>
Date: Wed, 13 Apr 2011 07:04:18 +0300
Subject: [PATCH] #9233: Fix json to work properly even when _json is not
 available.

---
 Lib/json/decoder.py | 2 +-
 Lib/json/scanner.py | 1 +
 Misc/NEWS           | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index d606cbd8c0..7b3d7d54a1 100644
--- 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 b4f356146f..f94d236149 100644
--- 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 021bcf15c2..6a4da30c3f 100644
--- 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'.
 
-- 
2.40.0