summaryrefslogtreecommitdiffstats
path: root/Lib/json
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-07-05 18:45:31 (GMT)
committerNed Deily <nad@acm.org>2015-07-05 18:45:31 (GMT)
commit53ecc58bd9da21989ae1811f97248b40e028ccd9 (patch)
tree53c87bb442d7e7971018a94030bf4e7929d772aa /Lib/json
parentab30353adbef3a3fdd54fb30856af8ff94f2c108 (diff)
parent54630d999f640b3ea0b9da302a112a0ccd5bdd96 (diff)
downloadcpython-53ecc58bd9da21989ae1811f97248b40e028ccd9.zip
cpython-53ecc58bd9da21989ae1811f97248b40e028ccd9.tar.gz
cpython-53ecc58bd9da21989ae1811f97248b40e028ccd9.tar.bz2
Issue #24540: merger from 3.4
Diffstat (limited to 'Lib/json')
-rw-r--r--Lib/json/__init__.py2
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``.