diff options
| author | Ned Deily <nad@acm.org> | 2015-07-05 18:46:12 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2015-07-05 18:46:12 (GMT) |
| commit | 14806c4b86196093e2bbe06b61a31a38ecb087a8 (patch) | |
| tree | 40b28ef512879066f32c98b19c849c938ea3ce3d /Lib | |
| parent | da2d51f97aaf630f5ad13aa004a6c5f0175ef780 (diff) | |
| parent | 53ecc58bd9da21989ae1811f97248b40e028ccd9 (diff) | |
| download | cpython-14806c4b86196093e2bbe06b61a31a38ecb087a8.zip cpython-14806c4b86196093e2bbe06b61a31a38ecb087a8.tar.gz cpython-14806c4b86196093e2bbe06b61a31a38ecb087a8.tar.bz2 | |
Issue #24540: merger from 3.5
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/json/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index 6ce9880..2612657 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -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``. |