merge with 3.3

diff --cc Misc/NEWS
index 4c88a540647af2df5dcc24cea161c7c7db8d4679,22f0abb23da38b80b514da9b39997ffa248049aa..e3b860a84fa3ffd94cade6ae443e60177b0c78ac
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -91,6 -49,12 +91,9 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #1159051: Back out a fix for handling corrupted gzip files that
 -  broke backwards compatibility.
 -
+ - Issue #17915: Fix interoperability of xml.sax with file objects returned by
+   codecs.open().
+ 
  - Issue #16601: Restarting iteration over tarfile no more continues from where
    it left off.  Patch by Michael Birtwell.
  
@@@ -280,6 -223,14 +283,12 @@@ Test
  - Issue #17692: test_sqlite now works with unittest test discovery.
    Patch by Zachary Ware.
  
 -- Issue #17843: Removed bz2 test data file that was triggering false-positive
 -  virus warnings with certain antivirus software.
+ 
+ Documentation
+ -------------
+ 
+ - Issue #15940: Specify effect of locale on time functions.
+ 
  - Issue #6696: add documentation for the Profile objects, and improve
    profile/cProfile docs.  Patch by Tom Pinckney.