mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 01:35:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-24641: Improved error message for JSON unserializible keys. (#4364)

Browse source 
Also updated an example for default() in the module docstring.
Removed quotes around type name in other error messages.
This commit is contained in:
Serhiy Storchaka 2017-11-25 17:38:20 +02:00 • committed by GitHub
parent 5b48dc638b
commit cfa797c068
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/json/encoder.py
View file

@ -176,8 +176,8 @@ class JSONEncoder(object):
return JSONEncoder.default(self, o)
"""
raise TypeError("Object of type '%s' is not JSON serializable" %
o.__class__.__name__)
raise TypeError(f'Object of type {o.__class__.__name__} '
f'is not JSON serializable')
def encode(self, o):
"""Return a JSON string representation of a Python data structure.
@ -373,7 +373,8 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
elif _skipkeys:
continue
else:
raise TypeError("key " + repr(key) + " is not a string")
raise TypeError(f'keys must be str, int, float, bool or None, '
f'not {key.__class__.__name__}')
if first:
first = False
else: