From: Donald Stufft <donald@stufft.io>
Date: Sat, 22 Mar 2014 01:38:50 +0000 (-0400)
Subject: Merge changes from 3.4 to bring in fixes for Issue #20995
X-Git-Tag: v3.5.0a1~2056
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71b4192e159b662bbbdb533c7577022e1a91f610;p=python

Merge changes from 3.4 to bring in fixes for Issue #20995
---

71b4192e159b662bbbdb533c7577022e1a91f610
diff --cc Misc/NEWS
index 3c7ac56bd2,b5b719d14e..b914fb372d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -23,23 -21,10 +23,29 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #20995: Enhance default ciphers used by the ssl module to enable
+   better security an prioritize perfect forward secrecy.
+ 
 +- Issue #20627: xmlrpc.client.ServerProxy is now a context manager.
 +
 +- Issue #19165: The formatter module now raises DeprecationWarning instead of
 +  PendingDeprecationWarning.
 +
 +- Issue #13936: Remove the ability of datetime.time instances to be considered
 +  false in boolean contexts.
 +
 +- Issue 18931: selectors module now supports /dev/poll on Solaris.
 +  Patch by Giampaolo Rodola'.
 +
 +- Issue #19977: When the ``LC_TYPE`` locale is the POSIX locale (``C`` locale),
 +  :py:data:`sys.stdin` and :py:data:`sys.stdout` are now using the
 +  ``surrogateescape`` error handler, instead of the ``strict`` error handler.
 +
 +- Issue #20574: Implement incremental decoder for cp65001 code (Windows code
 +  page 65001, Microsoft UTF-8).
++=======
+ - Issue #20884: Don't assume that __file__ is defined on importlib.__init__.
++>>>>>>> other
  
  - Issue #20879: Delay the initialization of encoding and decoding tables for
    base32, ascii85 and base85 codecs in the base64 module, and delay the