Issue #24540: merger from 3.5

This commit is contained in:
Ned Deily 2015-07-05 11:46:12 -07:00
commit 14806c4b86

View File

@ -184,7 +184,7 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True,
default=None, sort_keys=False, **kw):
"""Serialize ``obj`` to a JSON formatted ``str``.
If ``skipkeys`` is false then ``dict`` keys that are not basic types
If ``skipkeys`` is true then ``dict`` keys that are not basic types
(``str``, ``int``, ``float``, ``bool``, ``None``) will be skipped
instead of raising a ``TypeError``.