diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 6bb7fe3a640..9064409f983 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. ``(',', diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py index 7475f5a5443..4b214eb60e8 100644 --- a/Lib/json/encoder.py +++ b/Lib/json/encoder.py @@ -233,7 +233,7 @@ class JSONEncoder(object): if (_one_shot and c_make_encoder is not None - and not self.indent): + and self.indent is None): _iterencode = c_make_encoder( markers, self.default, _encoder, self.indent, self.key_separator, self.item_separator, self.sort_keys, diff --git a/Lib/test/json_tests/test_indent.py b/Lib/test/json_tests/test_indent.py index d8030aaade1..692a494cfe5 100644 --- a/Lib/test/json_tests/test_indent.py +++ b/Lib/test/json_tests/test_indent.py @@ -2,6 +2,7 @@ from unittest import TestCase import json import textwrap +from io import StringIO class TestIndent(TestCase): def test_indent(self): @@ -43,3 +44,18 @@ class TestIndent(TestCase): self.assertEqual(h3, h) self.assertEqual(d2, expect.expandtabs(2)) self.assertEqual(d3, expect) + + def test_indent0(self): + h = {3: 1} + def check(indent, expected): + d1 = json.dumps(h, indent=indent) + self.assertEqual(d1, expected) + + sio = StringIO() + json.dump(h, sio, indent=indent) + self.assertEqual(sio.getvalue(), expected) + + # indent=0 should emit newlines + check(0, '{\n"3": 1\n}') + # indent=None is more compact + check(None, '{"3": 1}') diff --git a/Misc/NEWS b/Misc/NEWS index bfa8f83b327..dd82a0c8cb5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -103,6 +103,9 @@ Core and Builtins Library ------- +- Issue #10019: Fixed regression in json module where an indent of 0 stopped + adding newlines and acted instead like 'None'. + - Issue #11186: pydoc ignores a module if its name contains a surrogate character in the index of modules.