summaryrefslogtreecommitdiff
path: root/Lib/json
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-13 01:53:38 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-13 01:53:38 +0200
commit220391fa6e08c79116522a9e00e1089e7ccaf963 (patch)
tree1e929abd36192434c559246d38b0b667a387b165 /Lib/json
parent72cdb5c39e8221e04aa858a1e5f48b02014aa2b0 (diff)
parenta7d64a6f4c0307f9c58ea170705b1552580d93eb (diff)
downloadcpython-git-220391fa6e08c79116522a9e00e1089e7ccaf963.tar.gz
#17368: merge with 3.2.
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 288686ab8e..51c3aa7851 100644
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -166,7 +166,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)