[Python-checkins] cpython (merge 3.2 -> default): Add glossary references
antoine.pitrou
python-checkins at python.org
Fri Aug 24 19:54:41 CEST 2012
http://hg.python.org/cpython/rev/343ef00d1dbe
changeset: 78746:343ef00d1dbe
parent: 78742:150c58d98a5d
parent: 78745:eeb44f8245b2
user: Antoine Pitrou <solipsis at pitrou.net>
date: Fri Aug 24 19:50:43 2012 +0200
summary:
Add glossary references
files:
Doc/library/json.rst | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -119,7 +119,7 @@
.. function:: dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True, cls=None, indent=None, separators=None, default=None, **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:`int`, :class:`float`, :class:`bool`,
@@ -183,8 +183,8 @@
.. function:: load(fp, cls=None, object_hook=None, parse_float=None, parse_int=None, parse_constant=None, object_pairs_hook=None, **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.
*object_hook* is an optional function that will be called with the result of
any object literal decoded (a :class:`dict`). The return value of
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list