diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-13 01:55:07 +0200 | 
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-13 01:55:07 +0200 | 
| commit | 405952f1a89c75d71bf8420b28d4bab1277e2ccd (patch) | |
| tree | 8dee9f1a2d9a15736a3173319f90dc071ac06b31 /Lib/json | |
| parent | 7192eddb4ad7814c98a2e02b943b0ccc9ec4bfd8 (diff) | |
| parent | 220391fa6e08c79116522a9e00e1089e7ccaf963 (diff) | |
| download | cpython-git-405952f1a89c75d71bf8420b28d4bab1277e2ccd.tar.gz | |
#17368: merge with 3.3.
Diffstat (limited to 'Lib/json')
| -rw-r--r-- | Lib/json/decoder.py | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py index 1b6c10b494..da7ef9c819 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)  | 
