summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2012-08-28 04:08:44 (GMT)
committerPetri Lehtinen <petri@digip.org>2012-08-28 04:08:44 (GMT)
commit72b1426cfb6c19932f8303614720b2a528d1dd3c (patch)
tree867f6409cec23252a0bff774e53066c808901dd9 /Doc
parent72c6eefcc638c6ca32c43f85a5180d9f091b2755 (diff)
downloadcpython-72b1426cfb6c19932f8303614720b2a528d1dd3c.zip
cpython-72b1426cfb6c19932f8303614720b2a528d1dd3c.tar.gz
cpython-72b1426cfb6c19932f8303614720b2a528d1dd3c.tar.bz2
#11964: Document a change in v3.2 to the json indent parameter
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/json.rst16
1 files changed, 12 insertions, 4 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index a5bfcd2..95f120c 100644
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -149,6 +149,9 @@ Basic Usage
indents that many spaces per level. If *indent* is a string (such as ``"\t"``),
that string is used to indent each level.
+ .. versionchanged:: 3.2
+ Allow strings for *indent* in addition to integers.
+
If *separators* is an ``(item_separator, dict_separator)`` tuple, then it
will be used instead of the default ``(', ', ': ')`` separators. ``(',',
':')`` is the most compact JSON representation.
@@ -371,10 +374,15 @@ Encoders and Decoders
will be sorted by key; this is useful for regression tests to ensure that
JSON serializations can be compared on a day-to-day basis.
- If *indent* is a non-negative integer (it is ``None`` by default), then JSON
- array elements and object members will be pretty-printed with that indent
- level. An indent level of 0 will only insert newlines. ``None`` is the most
- compact representation.
+ If *indent* is a non-negative integer or string, then JSON array elements and
+ object members will be pretty-printed with that indent level. An indent level
+ of 0, negative, or ``""`` will only insert newlines. ``None`` (the default)
+ selects the most compact representation. Using a positive integer indent
+ indents that many spaces per level. If *indent* is a string (such as ``"\t"``),
+ that string is used to indent each level.
+
+ .. versionchanged:: 3.2
+ Allow strings for *indent* in addition to integers.
If specified, *separators* should be an ``(item_separator, key_separator)``
tuple. The default is ``(', ', ': ')``. To get the most compact JSON