[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #24540: merger from 3.4

[ned.deily]

https://hg.python.org/cpython/rev/038b4f61d9b7
changeset:   96839:038b4f61d9b7
branch:      3.5
parent:      96835:190f25b7e799
parent:      96838:0deca75537ec
user:        Ned Deily <nad at acm.org>
date:        Sun Jul 05 11:45:31 2015 -0700
summary:
  Issue #24540: merger from 3.4

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