Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
02adc570
Commit
02adc570
authored
Oct 30, 2016
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #28541: Improve test coverage for encoding detection in json library.
Original patch by Eric Appelt.
parent
06d79d02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
Lib/json/__init__.py
Lib/json/__init__.py
+2
-1
Lib/test/test_json/test_unicode.py
Lib/test/test_json/test_unicode.py
+13
-0
No files found.
Lib/json/__init__.py
View file @
02adc570
...
...
@@ -257,7 +257,8 @@ def detect_encoding(b):
return
'utf-16-be'
if
b
[
1
]
else
'utf-32-be'
if
not
b
[
1
]:
# XX 00 00 00 - utf-32-le
# XX 00 XX XX - utf-16-le
# XX 00 00 XX - utf-16-le
# XX 00 XX -- - utf-16-le
return
'utf-16-le'
if
b
[
2
]
or
b
[
3
]
else
'utf-32-le'
elif
len
(
b
)
==
2
:
if
not
b
[
0
]:
...
...
Lib/test/test_json/test_unicode.py
View file @
02adc570
...
...
@@ -65,6 +65,19 @@ class TestUnicode:
self
.
assertEqual
(
self
.
loads
(
bom
+
encoded
),
data
)
self
.
assertEqual
(
self
.
loads
(
encoded
),
data
)
self
.
assertRaises
(
UnicodeDecodeError
,
self
.
loads
,
b'["
\
x80
"]'
)
# RFC-7159 and ECMA-404 extend JSON to allow documents that
# consist of only a string, which can present a special case
# not covered by the encoding detection patterns specified in
# RFC-4627 for utf-16-le (XX 00 XX 00).
self
.
assertEqual
(
self
.
loads
(
'"
\
u2600
"'
.
encode
(
'utf-16-le'
)),
'
\
u2600
'
)
# Encoding detection for small (<4) bytes objects
# is implemented as a special case. RFC-7159 and ECMA-404
# allow single codepoint JSON documents which are only two
# bytes in utf-16 encodings w/o BOM.
self
.
assertEqual
(
self
.
loads
(
b'5
\
x00
'
),
5
)
self
.
assertEqual
(
self
.
loads
(
b'
\
x00
7'
),
7
)
self
.
assertEqual
(
self
.
loads
(
b'57'
),
57
)
def
test_object_pairs_hook_with_unicode
(
self
):
s
=
'{"xkd":1, "kcw":2, "art":3, "hxm":4, "qrt":5, "pad":6, "hoy":7}'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment