mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

issue10883 - Silence some ftp related ResourceWarnings in test_urllib2net. Patch by Nadeem Vawda

Browse source
This commit is contained in:
Senthil Kumaran 2011-03-24 11:47:29 +08:00
commit e6ead3905d
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/urllib/request.py
View file

@ -2136,7 +2136,7 @@ class ftpwrapper:
# Try to retrieve as a file # Try to retrieve as a file
try: try:
cmd = 'RETR ' + file cmd = 'RETR ' + file
conn = self.ftp.ntransfercmd(cmd) conn, retrlen = self.ftp.ntransfercmd(cmd)
except ftplib.error_perm as reason: except ftplib.error_perm as reason:
if str(reason)[:3] != '550': if str(reason)[:3] != '550':
raise URLError('ftp error', reason).with_traceback( raise URLError('ftp error', reason).with_traceback(
@ -2157,10 +2157,14 @@ class ftpwrapper:
cmd = 'LIST ' + file cmd = 'LIST ' + file
else: else:
cmd = 'LIST' cmd = 'LIST'
conn = self.ftp.ntransfercmd(cmd) conn, retrlen = self.ftp.ntransfercmd(cmd)
self.busy = 1 self.busy = 1
ftpobj = addclosehook(conn.makefile('rb'), self.endtransfer)
conn.close()
# Pass back both a suitably decorated object and a retrieval length # Pass back both a suitably decorated object and a retrieval length
return (addclosehook(conn[0].makefile('rb'), self.endtransfer), conn[1]) return (ftpobj, retrlen)
def endtransfer(self): def endtransfer(self):
if not self.busy: if not self.busy:
return return