diff options
author | R David Murray <rdmurray@bitdance.com> | 2011-04-12 21:00:26 -0400 |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2011-04-12 21:00:26 -0400 |
commit | ea8b6ef15f047536d4222f2b810d10756adc0dac (patch) | |
tree | aa033ebf6bbd5d787a8e4805de9e291292dca458 /Lib/json/encoder.py | |
parent | 49c440877e2d13bb545243ad2cb427272f530cab (diff) | |
download | cpython-git-ea8b6ef15f047536d4222f2b810d10756adc0dac.tar.gz |
#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 'Lib/json/encoder.py')
-rw-r--r-- | Lib/json/encoder.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py index d8692c4881..906c46216a 100644 --- a/Lib/json/encoder.py +++ b/Lib/json/encoder.py @@ -251,7 +251,7 @@ class JSONEncoder(object): if (_one_shot and c_make_encoder is not None - and not self.indent and not self.sort_keys): + and self.indent is None and not self.sort_keys): _iterencode = c_make_encoder( markers, self.default, _encoder, self.indent, self.key_separator, self.item_separator, self.sort_keys, |