cpython: 33603f7949c5 (original) (raw)

Mercurial > cpython

changeset 93992:33603f7949c5

merge 3.4 (#23111) [#23111]

Benjamin Peterson benjamin@python.org
date	Tue, 30 Dec 2014 15:16:13 -0600
parents	d5f2bcfd544c(current diff)414c450e8406(diff)
children	01437956ea67
files	Lib/ftplib.py Misc/NEWS
diffstat	2 files changed, 5 insertions(+), 2 deletions(-)[+] [-] Lib/ftplib.py 4 Misc/NEWS 3

line wrap: on

line diff

--- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -713,7 +713,7 @@ else: '221 Goodbye.' >>> '''

   ssl_version = ssl.PROTOCOL_TLSv1[](#l1.7)

   ssl_version = ssl.PROTOCOL_SSLv23[](#l1.8)

def init(self, host='', user='', passwd='', acct='', keyfile=None, certfile=None, context=None, @@ -743,7 +743,7 @@ else: '''Set up secure control connection by using TLS/SSL.''' if isinstance(self.sock, ssl.SSLSocket): raise ValueError("Already using TLS")

       if self.ssl_version == ssl.PROTOCOL_TLSv1:[](#l1.16)

       if self.ssl_version >= ssl.PROTOCOL_SSLv23:[](#l1.17)
           resp = self.voidcmd('AUTH TLS')[](#l1.18)
       else:[](#l1.19)
           resp = self.voidcmd('AUTH SSL')[](#l1.20)

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -207,6 +207,9 @@ Library

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.