mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

#19307: Improve error message for json.load(s) while passing objects of the wrong type.

Browse source
This commit is contained in:
Ezio Melotti 2013-10-21 01:52:33 +03:00
parent 4ea16e56eb
commit a0e768ccc2
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/json/__init__.py
View file

@ -310,6 +310,9 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None,
The ``encoding`` argument is ignored and deprecated.
"""
if not isinstance(s, str):
raise TypeError('the JSON object must be str, not {!r}'.format(
s.__class__.__name__))
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):