summaryrefslogtreecommitdiffstats
path: root/Lib/json
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-12 23:55:07 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-12 23:55:07 (GMT)
commit405952f1a89c75d71bf8420b28d4bab1277e2ccd (patch)
tree8dee9f1a2d9a15736a3173319f90dc071ac06b31 /Lib/json
parent7192eddb4ad7814c98a2e02b943b0ccc9ec4bfd8 (diff)
parent220391fa6e08c79116522a9e00e1089e7ccaf963 (diff)
downloadcpython-405952f1a89c75d71bf8420b28d4bab1277e2ccd.zip
cpython-405952f1a89c75d71bf8420b28d4bab1277e2ccd.tar.gz
cpython-405952f1a89c75d71bf8420b28d4bab1277e2ccd.tar.bz2
#17368: merge with 3.3.
Diffstat (limited to 'Lib/json')
-rw-r--r--Lib/json/decoder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index 1b6c10b..da7ef9c 100644
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -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)