summaryrefslogtreecommitdiffstats
path: root/Lib/json/encoder.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2011-04-13 01:02:45 (GMT)
committerR David Murray <rdmurray@bitdance.com>2011-04-13 01:02:45 (GMT)
commit3dd02d62c90a169a32fb38bed34249a6cf7e1638 (patch)
tree7ace2c16e725e311f9702ee6cc15de8ef81dc387 /Lib/json/encoder.py
parentabdeeff3d1fa505fa1d49970cb7a70446f3e2b75 (diff)
downloadcpython-3dd02d62c90a169a32fb38bed34249a6cf7e1638.zip
cpython-3dd02d62c90a169a32fb38bed34249a6cf7e1638.tar.gz
cpython-3dd02d62c90a169a32fb38bed34249a6cf7e1638.tar.bz2
#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.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index 1335985..accbde0 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,