diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 02:26:15 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 02:26:15 +0200 |
| commit | 8f539b591e32b51b7c9b39da3745698feb271b22 (patch) | |
| tree | e3df2cd474923eda78b8fa864b941850d58ab3c5 /Lib/json | |
| parent | 21b88b83f813a30f697b2e8de188da7ee329baf1 (diff) | |
| parent | 2d1300dfc934efc5242a6cf3753e2724f3bbc946 (diff) | |
| download | cpython-8f539b591e32b51b7c9b39da3745698feb271b22.tar.gz | |
#16476: merge with 3.2.
Diffstat (limited to 'Lib/json')
| -rw-r--r-- | Lib/json/decoder.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py index dc1155b1cc..07fd696400 100644 --- a/Lib/json/decoder.py +++ b/Lib/json/decoder.py @@ -121,8 +121,7 @@ def py_scanstring(s, end, strict=True, msg = "Invalid \\uXXXX escape" raise ValueError(errmsg(msg, s, end)) uni = int(esc, 16) - # Check for surrogate pair on UCS-4 systems - if 0xd800 <= uni <= 0xdbff and sys.maxunicode > 65535: + if 0xd800 <= uni <= 0xdbff: msg = "Invalid \\uXXXX\\uXXXX surrogate pair" if not s[end + 5:end + 7] == '\\u': raise ValueError(errmsg(msg, s, end)) |