cpython: e63ac05ccfa8 (original) (raw)

Mercurial > cpython

changeset 80631:e63ac05ccfa8

#16333: use (",", ": ") as default separator when indent is specified to avoid trailing whitespace. Patch by Serhiy Storchaka. [#16333]

line wrap: on

line diff

--- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -155,9 +155,13 @@ Basic Usage .. 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.

• If specified, separators should be an (item_separator, key_separator)
• tuple. The default is (', ', ': ') if indent is None and
• (',', ': ') otherwise. To get the most compact JSON representation,
• you should specify (',', ':') to eliminate whitespace. +
• .. versionchanged:: 3.4

•  Use ``(',', ': ')`` as default if *indent* is not ``None``.[](#l1.16)

default(obj) is a function that should return a serializable version of obj or raise :exc:TypeError. The default simply raises :exc:TypeError. @@ -394,8 +398,12 @@ Encoders and Decoders 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
• representation, you should specify (',', ':') to eliminate whitespace.

• tuple. The default is (', ', ': ') if indent is None and
• (',', ': ') otherwise. To get the most compact JSON representation,
• you should specify (',', ':') to eliminate whitespace. +
• .. versionchanged:: 3.4

•  Use ``(',', ': ')`` as default if *indent* is not ``None``.[](#l1.31)

If specified, default is a function that gets called for objects that can't otherwise be serialized. It should return a JSON encodable version of the

--- a/Lib/json/init.py +++ b/Lib/json/init.py @@ -148,9 +148,10 @@ def dump(obj, fp, skipkeys=False, ensure level of 0 will only insert newlines. None is the most compact representation.

• 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.

• If specified, separators should be an (item_separator, key_separator)
• tuple. The default is (', ', ': ') if indent is None and
• (',', ': ') otherwise. To get the most compact JSON representation,
• you should specify (',', ':') to eliminate whitespace.

default(obj) is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. @@ -209,9 +210,10 @@ def dumps(obj, skipkeys=False, ensure_as level of 0 will only insert newlines. None is the most compact representation.

• 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.

• If specified, separators should be an (item_separator, key_separator)
• tuple. The default is (', ', ': ') if indent is None and
• (',', ': ') otherwise. To get the most compact JSON representation,
• you should specify (',', ':') to eliminate whitespace.

default(obj) is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError.

--- a/Lib/json/encoder.py +++ b/Lib/json/encoder.py @@ -127,9 +127,10 @@ class JSONEncoder(object): indent level. An indent level of 0 will only insert newlines. None is the most compact representation.

•    If specified, separators should be a (item_separator, key_separator)[](#l3.7)

•    tuple.  The default is (', ', ': ').  To get the most compact JSON[](#l3.8)

•    representation you should specify (',', ':') to eliminate whitespace.[](#l3.9)

•    If specified, separators should be an (item_separator, key_separator)[](#l3.10)

•    tuple.  The default is (', ', ': ') if *indent* is ``None`` and[](#l3.11)

•    (',', ': ') otherwise.  To get the most compact JSON representation,[](#l3.12)

•    you should specify (',', ':') to eliminate whitespace.[](#l3.13)

If specified, default is a function that gets called for objects that can't otherwise be serialized. It should return a JSON encodable @@ -145,6 +146,8 @@ class JSONEncoder(object): self.indent = indent if separators is not None: self.item_separator, self.key_separator = separators

•    elif indent is not None:[](#l3.21)

•        self.item_separator = ','[](#l3.22)
     if default is not None:[](#l3.23)
         self.default = default[](#l3.24)

--- a/Lib/test/json_tests/test_indent.py +++ b/Lib/test/json_tests/test_indent.py @@ -32,6 +32,8 @@ class TestIndent: d1 = self.dumps(h) d2 = self.dumps(h, indent=2, sort_keys=True, separators=(',', ': ')) d3 = self.dumps(h, indent='\t', sort_keys=True, separators=(',', ': '))

•    d4 = self.dumps(h, indent=2, sort_keys=True)[](#l4.7)

•    d5 = self.dumps(h, indent='\t', sort_keys=True)[](#l4.8)

h1 = self.loads(d1) h2 = self.loads(d2) @@ -42,6 +44,8 @@ class TestIndent: self.assertEqual(h3, h) self.assertEqual(d2, expect.expandtabs(2)) self.assertEqual(d3, expect)

•    self.assertEqual(d4, d2)[](#l4.16)

•    self.assertEqual(d5, d3)[](#l4.17)

def test_indent0(self): h = {3: 1}