merge 3.3 (#16573)

diff --cc Misc/NEWS
index 7fd47395c68949a682fa75b94feed3cef3cb6699,875f83dbebdeb934435cd0effbe892c56135924b..5fe7d1d18f021791df1062bf41deca7bb7fd5191
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,9 -96,12 +140,13 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #16476: Fix json.tool to avoid including trailing whitespace.
 -
 +- 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 #16549: Make json.tool work again on Python 3 and add tests.
    Initial patch by Berker Peksag and Serhiy Storchaka.