diff options
| author | Ned Deily <nad@acm.org> | 2015-07-05 11:45:31 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2015-07-05 11:45:31 -0700 |
| commit | 72fb7b18d445f4093b77a18ab1c6c974c7cc08af (patch) | |
| tree | 1d11489f7965b30333fbc6a3c819dc943662bfb7 /Lib/json | |
| parent | 154bdf572a50c4b598f4a99bc119d3d214fc93ff (diff) | |
| parent | c26e8c5a2bfc26c6ef3c7c7b146d661c7f227805 (diff) | |
| download | cpython-72fb7b18d445f4093b77a18ab1c6c974c7cc08af.tar.gz | |
Issue #24540: merger from 3.4
Diffstat (limited to 'Lib/json')
| -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 6ce9880b26..2612657faf 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``. |