#17368: merge with 3.3.
This commit is contained in:
commit
405952f1a8
|
@ -158,7 +158,7 @@ def JSONObject(s_and_end, strict, scan_once, object_hook, object_pairs_hook,
|
|||
if nextchar == '}':
|
||||
if object_pairs_hook is not None:
|
||||
result = object_pairs_hook(pairs)
|
||||
return result, end
|
||||
return result, end + 1
|
||||
pairs = {}
|
||||
if object_hook is not None:
|
||||
pairs = object_hook(pairs)
|
||||
|
|
|
@ -25,16 +25,22 @@ class TestDecode:
|
|||
p = [("xkd", 1), ("kcw", 2), ("art", 3), ("hxm", 4),
|
||||
("qrt", 5), ("pad", 6), ("hoy", 7)]
|
||||
self.assertEqual(self.loads(s), eval(s))
|
||||
self.assertEqual(self.loads(s, object_pairs_hook = lambda x: x), p)
|
||||
self.assertEqual(self.loads(s, object_pairs_hook=lambda x: x), p)
|
||||
self.assertEqual(self.json.load(StringIO(s),
|
||||
object_pairs_hook=lambda x: x), p)
|
||||
od = self.loads(s, object_pairs_hook = OrderedDict)
|
||||
od = self.loads(s, object_pairs_hook=OrderedDict)
|
||||
self.assertEqual(od, OrderedDict(p))
|
||||
self.assertEqual(type(od), OrderedDict)
|
||||
# the object_pairs_hook takes priority over the object_hook
|
||||
self.assertEqual(self.loads(s, object_pairs_hook = OrderedDict,
|
||||
object_hook = lambda x: None),
|
||||
self.assertEqual(self.loads(s, object_pairs_hook=OrderedDict,
|
||||
object_hook=lambda x: None),
|
||||
OrderedDict(p))
|
||||
# check that empty objects literals work (see #17368)
|
||||
self.assertEqual(self.loads('{}', object_pairs_hook=OrderedDict),
|
||||
OrderedDict())
|
||||
self.assertEqual(self.loads('{"empty": {}}',
|
||||
object_pairs_hook=OrderedDict),
|
||||
OrderedDict([('empty', OrderedDict())]))
|
||||
|
||||
def test_decoder_optimizations(self):
|
||||
# Several optimizations were made that skip over calls to
|
||||
|
|
|
@ -277,6 +277,10 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #17368: Fix an off-by-one error in the Python JSON decoder that caused
|
||||
a failure while decoding empty object literals when object_pairs_hook was
|
||||
specified.
|
||||
|
||||
_ Issue #17385: Fix quadratic behavior in threading.Condition. The FIFO
|
||||
queue now uses a deque instead of a list.
|
||||
|
||||
|
|
Loading…
Reference in New Issue