From: Ned Deily Date: Sun, 5 Jul 2015 18:43:59 +0000 (-0700) Subject: Issue #24540: fix typo in json.dumps docstring X-Git-Tag: v2.7.11rc1~254 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c5824aaa5e22e8fe8ab35ec48d775fbb90c4a13;p=thirdparty%2FPython%2Fcpython.git Issue #24540: fix typo in json.dumps docstring --- diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index 0be85da022b2..140a3d0e58e0 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -195,10 +195,11 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, encoding='utf-8', 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``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. + If ``ensure_ascii`` is false, all non-ASCII characters are not escaped, and the return value may be a ``unicode`` instance. See ``dump`` for details.