From ffd849618aad1268c6fb25cab5685fab16c55705 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 26 Jan 2010 15:57:21 +0000
Subject: #7092: fix DeprecationWarnings for json when the tests are run with
 -3 -Wd.

---
 Lib/json/decoder.py         | 6 ++++--
 Lib/json/encoder.py         | 5 +----
 Lib/json/tests/test_dump.py | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index 44635a0..73236ed 100644
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -146,8 +146,9 @@ scanstring = c_scanstring or py_scanstring
 WHITESPACE = re.compile(r'[ \t\n\r]*', FLAGS)
 WHITESPACE_STR = ' \t\n\r'
 
-def JSONObject((s, end), encoding, strict, scan_once, object_hook,
+def JSONObject(s_and_end, encoding, strict, scan_once, object_hook,
                object_pairs_hook, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
+    s, end = s_and_end
     pairs = []
     pairs_append = pairs.append
     # Use a slice to prevent IndexError from being raised, the following
@@ -227,7 +228,8 @@ def JSONObject((s, end), encoding, strict, scan_once, object_hook,
         pairs = object_hook(pairs)
     return pairs, end
 
-def JSONArray((s, end), scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
+def JSONArray(s_and_end, scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
+    s, end = s_and_end
     values = []
     nextchar = s[end:end + 1]
     if nextchar in _ws:
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index 027a1a6..d8692c4 100644
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -266,8 +266,6 @@ class JSONEncoder(object):
 def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
         _key_separator, _item_separator, _sort_keys, _skipkeys, _one_shot,
         ## HACK: hand-optimized bytecode; turn globals into locals
-        False=False,
-        True=True,
         ValueError=ValueError,
         basestring=basestring,
         dict=dict,
@@ -354,8 +352,7 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
             item_separator = _item_separator
         first = True
         if _sort_keys:
-            items = dct.items()
-            items.sort(key=lambda kv: kv[0])
+            items = sorted(dct.items(), key=lambda kv: kv[0])
         else:
             items = dct.iteritems()
         for key, value in items:
diff --git a/Lib/json/tests/test_dump.py b/Lib/json/tests/test_dump.py
index 9fa0ba8..39875d5 100644
--- a/Lib/json/tests/test_dump.py
+++ b/Lib/json/tests/test_dump.py
@@ -17,5 +17,5 @@ class TestDump(TestCase):
                  {True: False, False: True}, sort_keys=True),
                  '{"false": true, "true": false}')
         self.assertEquals(json.dumps(
-                {2: 3.0, 4.0: 5L, False: 1, 6L: True, "7": 0}, sort_keys=True),
-                '{"false": 1, "2": 3.0, "4.0": 5, "6": true, "7": 0}')
+                {2: 3.0, 4.0: 5L, False: 1, 6L: True}, sort_keys=True),
+                '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')
-- 
cgit v0.12