diff options
| author | Donald Stufft <donald@stufft.io> | 2014-03-22 01:49:38 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-03-22 01:49:38 (GMT) |
| commit | 04ea84a20da667e39790827b978b21732753bd91 (patch) | |
| tree | 4e95502cb7254107acf363c1251b935b4614ad37 | |
| parent | 71b4192e159b662bbbdb533c7577022e1a91f610 (diff) | |
| download | cpython-04ea84a20da667e39790827b978b21732753bd91.zip cpython-04ea84a20da667e39790827b978b21732753bd91.tar.gz cpython-04ea84a20da667e39790827b978b21732753bd91.tar.bz2 | |
Fix an incomplete merge of Misc/NEWS
| -rw-r--r-- | Misc/NEWS | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -26,6 +26,8 @@ Library - Issue #20995: Enhance default ciphers used by the ssl module to enable 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 #19165: The formatter module now raises DeprecationWarning instead of @@ -43,9 +45,6 @@ Library - 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 |