traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix #13563: make use of with statement in ftplib.py where needed

This commit is contained in:
Giampaolo Rodola' 2011-12-10 21:25:04 +01:00
parent 313b2ad1a8
commit 836e9aab2f
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Lib/ftplib.py
View File

@ -359,8 +359,7 @@ class FTP:
conn.close() conn.close()
raise raise
else: else:
sock = self.makeport() with self.makeport() as sock:
try:
if rest is not None: if rest is not None:
self.sendcmd("REST %s" % rest) self.sendcmd("REST %s" % rest)
resp = self.sendcmd(cmd) resp = self.sendcmd(cmd)
@ -372,8 +371,6 @@ class FTP:
conn, sockaddr = sock.accept() conn, sockaddr = sock.accept()
if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT: if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
conn.settimeout(self.timeout) conn.settimeout(self.timeout)
finally:
sock.close()
if resp[:3] == '150': if resp[:3] == '150':
# this is conditional in case we received a 125 # this is conditional in case we received a 125
size = parse150(resp) size = parse150(resp)
@ -753,8 +750,7 @@ else:
def retrbinary(self, cmd, callback, blocksize=8192, rest=None): def retrbinary(self, cmd, callback, blocksize=8192, rest=None):
self.voidcmd('TYPE I') self.voidcmd('TYPE I')
conn = self.transfercmd(cmd, rest) with self.transfercmd(cmd, rest) as conn:
try:
while 1: while 1:
data = conn.recv(blocksize) data = conn.recv(blocksize)
if not data: if not data:
@ -763,8 +759,6 @@ else:
# shutdown ssl layer # shutdown ssl layer
if isinstance(conn, ssl.SSLSocket): if isinstance(conn, ssl.SSLSocket):
conn.unwrap() conn.unwrap()
finally:
conn.close()
return self.voidresp() return self.voidresp()
def retrlines(self, cmd, callback = None): def retrlines(self, cmd, callback = None):
@ -772,7 +766,7 @@ else:
resp = self.sendcmd('TYPE A') resp = self.sendcmd('TYPE A')
conn = self.transfercmd(cmd) conn = self.transfercmd(cmd)
fp = conn.makefile('r', encoding=self.encoding) fp = conn.makefile('r', encoding=self.encoding)
try: with fp, conn:
while 1: while 1:
line = fp.readline() line = fp.readline()
if self.debugging > 2: print('*retr*', repr(line)) if self.debugging > 2: print('*retr*', repr(line))
@ -786,15 +780,11 @@ else:
# shutdown ssl layer # shutdown ssl layer
if isinstance(conn, ssl.SSLSocket): if isinstance(conn, ssl.SSLSocket):
conn.unwrap() conn.unwrap()
finally:
fp.close()
conn.close()
return self.voidresp() return self.voidresp()
def storbinary(self, cmd, fp, blocksize=8192, callback=None, rest=None): def storbinary(self, cmd, fp, blocksize=8192, callback=None, rest=None):
self.voidcmd('TYPE I') self.voidcmd('TYPE I')
conn = self.transfercmd(cmd, rest) with self.transfercmd(cmd, rest) as conn:
try:
while 1: while 1:
buf = fp.read(blocksize) buf = fp.read(blocksize)
if not buf: break if not buf: break
@ -803,14 +793,11 @@ else:
# shutdown ssl layer # shutdown ssl layer
if isinstance(conn, ssl.SSLSocket): if isinstance(conn, ssl.SSLSocket):
conn.unwrap() conn.unwrap()
finally:
conn.close()
return self.voidresp() return self.voidresp()
def storlines(self, cmd, fp, callback=None): def storlines(self, cmd, fp, callback=None):
self.voidcmd('TYPE A') self.voidcmd('TYPE A')
conn = self.transfercmd(cmd) with self.transfercmd(cmd) as conn:
try:
while 1: while 1:
buf = fp.readline() buf = fp.readline()
if not buf: break if not buf: break
@ -822,8 +809,6 @@ else:
# shutdown ssl layer # shutdown ssl layer
if isinstance(conn, ssl.SSLSocket): if isinstance(conn, ssl.SSLSocket):
conn.unwrap() conn.unwrap()
finally:
conn.close()
return self.voidresp() return self.voidresp()
def abort(self): def abort(self):