summaryrefslogtreecommitdiffstats
path: root/Lib/json/encoder.py
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2011-04-13 01:35:37 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2011-04-13 01:35:37 (GMT)
commita8b0f9adfeac1aa5bb8189c46a9cc7d01f89d8a5 (patch)
tree8b66d8bf9f0ddbaceb9fa9d39cf03c9390d13a6f /Lib/json/encoder.py
parent60f02a650ed85a9985aba10a019df0a1f83d3554 (diff)
parent3dd02d62c90a169a32fb38bed34249a6cf7e1638 (diff)
downloadcpython-a8b0f9adfeac1aa5bb8189c46a9cc7d01f89d8a5.zip
cpython-a8b0f9adfeac1aa5bb8189c46a9cc7d01f89d8a5.tar.gz
cpython-a8b0f9adfeac1aa5bb8189c46a9cc7d01f89d8a5.tar.bz2
Merge updates
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,