(Merge 3.4) Issue #23881: urllib.request.ftpwrapper constructor now closes the

socket if the FTP connection failed to fix a ResourceWarning.
This commit is contained in:
Victor Stinner 2015-04-07 12:50:24 +02:00
commit a9dd680d23
2 changed files with 8 additions and 1 deletions

View File

@ -2255,7 +2255,11 @@ class ftpwrapper:
self.timeout = timeout
self.refcount = 0
self.keepalive = persistent
self.init()
try:
self.init()
except:
self.close()
raise
def init(self):
import ftplib

View File

@ -19,6 +19,9 @@ Core and Builtins
Library
-------
- Issue #23881: urllib.request.ftpwrapper constructor now closes the socket if
the FTP connection failed to fix a ResourceWarning.
- Issue #23853: :meth:`socket.socket.sendall` does no more reset the socket
timeout each time data is sent successfuly. The socket timeout is now the
maximum total duration to send all data.