From: Benjamin Peterson Date: Tue, 30 Dec 2014 21:16:13 +0000 (-0600) Subject: merge 3.4 (#23111) X-Git-Tag: v3.5.0a1~261 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfdec6263f7ad9965d3c15f0535a7a08ac805af1;p=python merge 3.4 (#23111) --- bfdec6263f7ad9965d3c15f0535a7a08ac805af1 diff --cc Misc/NEWS index a5e1395795,42cbc39d6e..dfcf72a25c --- a/Misc/NEWS +++ b/Misc/NEWS @@@ -207,9 -53,6 +207,12 @@@ Librar - Issue #23093: In the io, module allow more operations to work on detached streams. ++- Issue #23111: In the ftplib, make ssl.PROTOCOL_SSLv23 the default protocol ++ version. ++ +- Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(), + instead of reading /dev/urandom, to get pseudo-random bytes. + - Issue #19104: pprint now produces evaluable output for wrapped strings. - Issue #23071: Added missing names to codecs.__all__. Patch by Martin Panter.