[Python-checkins] cpython (merge 3.5 -> default): Issue #24540: merger from 3.5
ned.deily
python-checkins at python.org
Sun Jul 5 20:46:37 CEST 2015
https://hg.python.org/cpython/rev/55755b2079fb
changeset: 96840:55755b2079fb
parent: 96836:6905a7f8c7ac
parent: 96839:038b4f61d9b7
user: Ned Deily <nad at acm.org>
date: Sun Jul 05 11:46:12 2015 -0700
summary:
Issue #24540: merger from 3.5
files:
Lib/json/__init__.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -184,7 +184,7 @@
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``.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list