[Python-checkins] r77755 - in python/trunk/Lib/json: decoder.py encoder.py tests/test_dump.py

[ezio.melotti]

Author: ezio.melotti
Date: Tue Jan 26 16:57:21 2010
New Revision: 77755

Log:
#7092: fix DeprecationWarnings for json when the tests are run with -3 -Wd.

Modified:
   python/trunk/Lib/json/decoder.py
   python/trunk/Lib/json/encoder.py
   python/trunk/Lib/json/tests/test_dump.py

Modified: python/trunk/Lib/json/decoder.py
==============================================================================
--- python/trunk/Lib/json/decoder.py	(original)
+++ python/trunk/Lib/json/decoder.py	Tue Jan 26 16:57:21 2010
@@ -146,8 +146,9 @@
 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 @@
         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:

Modified: python/trunk/Lib/json/encoder.py
==============================================================================
--- python/trunk/Lib/json/encoder.py	(original)
+++ python/trunk/Lib/json/encoder.py	Tue Jan 26 16:57:21 2010
@@ -266,8 +266,6 @@
 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 @@
             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:

Modified: python/trunk/Lib/json/tests/test_dump.py
==============================================================================
--- python/trunk/Lib/json/tests/test_dump.py	(original)
+++ python/trunk/Lib/json/tests/test_dump.py	Tue Jan 26 16:57:21 2010
@@ -17,5 +17,5 @@
                  {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}')