From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 29 Nov 2012 15:58:43 +0000 (-0500)
Subject: merge 3.3 (#16573)
X-Git-Tag: v3.4.0a1~1927
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4089eec0988f4ca19f8bb67398966df33b6b92d1;p=python

merge 3.3 (#16573)
---

4089eec0988f4ca19f8bb67398966df33b6b92d1
diff --cc Misc/NEWS
index 7fd47395c6,875f83dbeb..5fe7d1d18f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,9 -96,12 +140,13 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #16333: use (",", ": ") as default separator when indent is specified
 +  to avoid trailing whitespace.  Patch by Serhiy Storchaka.
 +
+ - Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous
+   list() calls aren't added to filter(), map(), and zip() which are directly
+   passed enumerate().
+ 
 -- Issue #16476: Fix json.tool to avoid including trailing whitespace.
 -
  - Issue #16549: Make json.tool work again on Python 3 and add tests.
    Initial patch by Berker Peksag and Serhiy Storchaka.