diff options
| author | Bob Ippolito <bob@redivi.com> | 2009-03-29 22:33:58 (GMT) |
|---|---|---|
| committer | Bob Ippolito <bob@redivi.com> | 2009-03-29 22:33:58 (GMT) |
| commit | 76a982a027d72287a6d9113b1d65ec6d327d744d (patch) | |
| tree | 0c2536d595c4b31e9bc996609123129e02b4543c /Lib/json/scanner.py | |
| parent | 8e1a3381293466a6d9a3873b46194a4ed9277619 (diff) | |
| download | cpython-76a982a027d72287a6d9113b1d65ec6d327d744d.zip cpython-76a982a027d72287a6d9113b1d65ec6d327d744d.tar.gz cpython-76a982a027d72287a6d9113b1d65ec6d327d744d.tar.bz2 | |
Issue 5381: fix regression in pure python code path, Issue 5584: fix a decoder bug for unicode float literals outside of a container
Diffstat (limited to 'Lib/json/scanner.py')
| -rw-r--r-- | Lib/json/scanner.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/json/scanner.py b/Lib/json/scanner.py index 00c5470..74e6805 100644 --- a/Lib/json/scanner.py +++ b/Lib/json/scanner.py @@ -23,6 +23,7 @@ def py_make_scanner(context): parse_int = context.parse_int parse_constant = context.parse_constant object_hook = context.object_hook + object_pairs_hook = context.object_pairs_hook def _scan_once(string, idx): try: @@ -34,7 +35,7 @@ def py_make_scanner(context): return parse_string(string, idx + 1, encoding, strict) elif nextchar == '{': return parse_object((string, idx + 1), encoding, strict, - _scan_once, object_hook) + _scan_once, object_hook, object_pairs_hook) elif nextchar == '[': return parse_array((string, idx + 1), _scan_once) elif nextchar == 'n' and string[idx:idx + 4] == 'null': |