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
566a2be9
Commit
566a2be9
authored
Oct 21, 2013
by
Ezio Melotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#18958: Improve error message for json.load(s) while passing a string that starts with a UTF-8 BOM.
parent
a0e768cc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
Lib/json/__init__.py
Lib/json/__init__.py
+2
-0
Lib/test/test_json/test_decode.py
Lib/test/test_json/test_decode.py
+14
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/json/__init__.py
View file @
566a2be9
...
...
@@ -313,6 +313,8 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None,
if
not
isinstance
(
s
,
str
):
raise
TypeError
(
'the JSON object must be str, not {!r}'
.
format
(
s
.
__class__
.
__name__
))
if
s
.
startswith
(
u'
\
ufeff
'
):
raise
ValueError
(
"Unexpected UTF-8 BOM (decode using utf-8-sig)"
)
if
(
cls
is
None
and
object_hook
is
None
and
parse_int
is
None
and
parse_float
is
None
and
parse_constant
is
None
and
object_pairs_hook
is
None
and
not
kw
):
...
...
Lib/test/test_json/test_decode.py
View file @
566a2be9
...
...
@@ -77,5 +77,19 @@ class TestDecode:
with
self
.
assertRaisesRegex
(
TypeError
,
msg
):
self
.
json
.
load
(
BytesIO
(
b'[1,2,3]'
))
def
test_string_with_utf8_bom
(
self
):
# see #18958
bom_json
=
"[1,2,3]"
.
encode
(
'utf-8-sig'
).
decode
(
'utf-8'
)
with
self
.
assertRaises
(
ValueError
)
as
cm
:
self
.
loads
(
bom_json
)
self
.
assertIn
(
'BOM'
,
str
(
cm
.
exception
))
with
self
.
assertRaises
(
ValueError
)
as
cm
:
self
.
json
.
load
(
StringIO
(
bom_json
))
self
.
assertIn
(
'BOM'
,
str
(
cm
.
exception
))
# make sure that the BOM is not detected in the middle of a string
bom_in_str
=
'"{}"'
.
format
(
''
.
encode
(
'utf-8-sig'
).
decode
(
'utf-8'
))
self
.
assertEqual
(
self
.
loads
(
bom_in_str
),
'
\
ufeff
'
)
self
.
assertEqual
(
self
.
json
.
load
(
StringIO
(
bom_in_str
)),
'
\
ufeff
'
)
class
TestPyDecode
(
TestDecode
,
PyTest
):
pass
class
TestCDecode
(
TestDecode
,
CTest
):
pass
Misc/NEWS
View file @
566a2be9
...
...
@@ -62,6 +62,9 @@ Core and Builtins
Library
-------
-
Issue
#
18958
:
Improve
error
message
for
json
.
load
(
s
)
while
passing
a
string
that
starts
with
a
UTF
-
8
BOM
.
-
Issue
#
19307
:
Improve
error
message
for
json
.
load
(
s
)
while
passing
objects
of
the
wrong
type
.
...
...
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