diff options
| author | R David Murray <rdmurray@bitdance.com> | 2011-04-13 01:09:18 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2011-04-13 01:09:18 (GMT) |
| commit | d5315482e92d1f3c47460999a790df684bf8b09e (patch) | |
| tree | d98dd2c8a709e6401a0c0a577ad9f9de191f73ed /Doc | |
| parent | 62f8bcb0a46fc0d8747ba2ab7e8d7311d73f82f7 (diff) | |
| parent | 3dd02d62c90a169a32fb38bed34249a6cf7e1638 (diff) | |
| download | cpython-d5315482e92d1f3c47460999a790df684bf8b09e.zip cpython-d5315482e92d1f3c47460999a790df684bf8b09e.tar.gz cpython-d5315482e92d1f3c47460999a790df684bf8b09e.tar.bz2 | |
Merge #10019: Fix regression relative to 2.6: add newlines if indent=0
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/json.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 6bb7fe3..9064409 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -136,10 +136,10 @@ Basic Usage 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 or ``""`` will only insert newlines. ``None`` (the default) selects the - most compact representation. Using an integer indent indents that many spaces - per level. If *indent* is a string (such at '\t'), that string is used to indent - each 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 at '\t'), + that string is used to indent each level. If *separators* is an ``(item_separator, dict_separator)`` tuple, then it will be used instead of the default ``(', ', ': ')`` separators. ``(',', |