Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix an incomplete merge of Misc/NEWS

This commit is contained in:
Donald Stufft 2014-03-21 21:49:38 -04:00
parent 71b4192e15
commit 04ea84a20d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Misc/NEWS
View File

@ -26,6 +26,8 @@ Library
- Issue #20995: Enhance default ciphers used by the ssl module to enable - Issue #20995: Enhance default ciphers used by the ssl module to enable
better security an prioritize perfect forward secrecy. better security an prioritize perfect forward secrecy.
- Issue #20884: Don't assume that __file__ is defined on importlib.__init__.
- Issue #20627: xmlrpc.client.ServerProxy is now a context manager. - Issue #20627: xmlrpc.client.ServerProxy is now a context manager.
- Issue #19165: The formatter module now raises DeprecationWarning instead of - Issue #19165: The formatter module now raises DeprecationWarning instead of
@ -43,9 +45,6 @@ Library
- Issue #20574: Implement incremental decoder for cp65001 code (Windows code - Issue #20574: Implement incremental decoder for cp65001 code (Windows code
page 65001, Microsoft UTF-8). 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 - Issue #20879: Delay the initialization of encoding and decoding tables for
base32, ascii85 and base85 codecs in the base64 module, and delay the base32, ascii85 and base85 codecs in the base64 module, and delay the