mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

#17368: merge with 3.3.

Browse source
This commit is contained in:
Ezio Melotti 2013-03-13 01:55:07 +02:00
commit 405952f1a8
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/json/decoder.py
View file

@ -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)