From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 13 Apr 2011 01:19:20 +0000 (-0400)
Subject: Merge #10019: Fix regression relative to 2.6: add newlines if indent=0
X-Git-Tag: v3.3.0a1~2605
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d16ee63df2fae102b71190162ce34f894b9b2abf;p=python

Merge #10019: Fix regression relative to 2.6: add newlines if indent=0

Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
---

d16ee63df2fae102b71190162ce34f894b9b2abf
diff --cc Misc/NEWS
index bfa8f83b32,af3ad9ac9a..dd82a0c8cb
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -103,12 -53,9 +103,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #10019: Fixed regression in json module where an indent of 0 stopped
+   adding newlines and acted instead like 'None'.
+ 
 +- Issue #11186: pydoc ignores a module if its name contains a surrogate
 +  character in the index of modules.
 +
 +- Issue #11815: Use a light-weight SimpleQueue for the result queue in
 +  concurrent.futures.ProcessPoolExecutor.
 +
  - Issue #5162: Treat services like frozen executables to allow child spawning
    from multiprocessing.forking on Windows.