mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Ezio Melotti 2010-01-26 15:57:21 +00:00
parent ef97caf111
commit ffd849618a
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/json/decoder.py
View file

@ -146,8 +146,9 @@ scanstring = c_scanstring or py_scanstring
WHITESPACE = re.compile(r'[ \t\n\r]*', FLAGS) WHITESPACE = re.compile(r'[ \t\n\r]*', FLAGS)
WHITESPACE_STR = ' \t\n\r' 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): object_pairs_hook, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
s, end = s_and_end
pairs = [] pairs = []
pairs_append = pairs.append pairs_append = pairs.append
# Use a slice to prevent IndexError from being raised, the following # 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) pairs = object_hook(pairs)
return pairs, end 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 = [] values = []
nextchar = s[end:end + 1] nextchar = s[end:end + 1]
if nextchar in _ws: if nextchar in _ws:

5
Lib/json/encoder.py
View file

@ -266,8 +266,6 @@ class JSONEncoder(object):
def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
_key_separator, _item_separator, _sort_keys, _skipkeys, _one_shot, _key_separator, _item_separator, _sort_keys, _skipkeys, _one_shot,
## HACK: hand-optimized bytecode; turn globals into locals ## HACK: hand-optimized bytecode; turn globals into locals
False=False,
True=True,
ValueError=ValueError, ValueError=ValueError,
basestring=basestring, basestring=basestring,
dict=dict, dict=dict,
@ -354,8 +352,7 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
item_separator = _item_separator item_separator = _item_separator
first = True first = True
if _sort_keys: if _sort_keys:
items = dct.items() items = sorted(dct.items(), key=lambda kv: kv[0])
items.sort(key=lambda kv: kv[0])
else: else:
items = dct.iteritems() items = dct.iteritems()
for key, value in items: for key, value in items:

4
Lib/json/tests/test_dump.py
View file

@ -17,5 +17,5 @@ class TestDump(TestCase):
{True: False, False: True}, sort_keys=True), {True: False, False: True}, sort_keys=True),
'{"false": true, "true": false}') '{"false": true, "true": false}')
self.assertEquals(json.dumps( self.assertEquals(json.dumps(
{2: 3.0, 4.0: 5L, False: 1, 6L: True, "7": 0}, sort_keys=True), {2: 3.0, 4.0: 5L, False: 1, 6L: True}, sort_keys=True),
'{"false": 1, "2": 3.0, "4.0": 5, "6": true, "7": 0}') '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')