From: Antoine Pitrou Date: Fri, 24 Aug 2012 17:49:08 +0000 (+0200) Subject: Add glossary references X-Git-Tag: v2.7.5~109^2~358 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85ede8da006212c923acc049124eb6f5b1866f29;p=python Add glossary references --- diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 437dce16db..69ebc4fc9c 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -120,7 +120,7 @@ Basic Usage .. function:: dump(obj, fp[, skipkeys[, ensure_ascii[, check_circular[, allow_nan[, cls[, indent[, separators[, encoding[, default[, **kw]]]]]]]]]]) Serialize *obj* as a JSON formatted stream to *fp* (a ``.write()``-supporting - file-like object). + :term:`file-like object`). If *skipkeys* is ``True`` (default: ``False``), then dict keys that are not of a basic type (:class:`str`, :class:`unicode`, :class:`int`, :class:`long`, @@ -185,8 +185,8 @@ Basic Usage .. function:: load(fp[, encoding[, cls[, object_hook[, parse_float[, parse_int[, parse_constant[, object_pairs_hook[, **kw]]]]]]]]) - Deserialize *fp* (a ``.read()``-supporting file-like object containing a JSON - document) to a Python object. + Deserialize *fp* (a ``.read()``-supporting :term:`file-like object` + containing a JSON document) to a Python object. If the contents of *fp* are encoded with an ASCII based encoding other than UTF-8 (e.g. latin-1), then an appropriate *encoding* name must be specified.