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 /Lib/json | |
| 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 'Lib/json')
| -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 7475f5a..4b214eb 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, |