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

Fix SF bug #459767: ftplib fails with files > 2GB 

size(), parse150(): try int() first, catch OverflowError, fall back to
long().
This commit is contained in:
Guido van Rossum 2001-10-16 19:45:52 +00:00
parent 5bf1ecd503
commit b6aca6afe2
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/ftplib.py
View File

@ -343,7 +343,7 @@ class FTP:
return conn, size return conn, size
def transfercmd(self, cmd, rest=None): def transfercmd(self, cmd, rest=None):
"""Like nstransfercmd() but returns only the socket.""" """Like ntransfercmd() but returns only the socket."""
return self.ntransfercmd(cmd, rest)[0] return self.ntransfercmd(cmd, rest)[0]
def login(self, user = '', passwd = '', acct = ''): def login(self, user = '', passwd = '', acct = ''):
@ -505,7 +505,11 @@ class FTP:
# Note that the RFC doesn't say anything about 'SIZE' # Note that the RFC doesn't say anything about 'SIZE'
resp = self.sendcmd('SIZE ' + filename) resp = self.sendcmd('SIZE ' + filename)
if resp[:3] == '213': if resp[:3] == '213':
return int(resp[3:].strip()) s = resp[3:].strip()
try:
return int(s)
except OverflowError:
return long(s)
def mkd(self, dirname): def mkd(self, dirname):
'''Make a directory, return its full pathname.''' '''Make a directory, return its full pathname.'''
@ -549,9 +553,13 @@ def parse150(resp):
import re import re
_150_re = re.compile("150 .* \((\d+) bytes\)", re.IGNORECASE) _150_re = re.compile("150 .* \((\d+) bytes\)", re.IGNORECASE)
m = _150_re.match(resp) m = _150_re.match(resp)
if m: if not m:
return int(m.group(1)) return None
return None s = m.group(1)
try:
return int(s)
except OverflowError:
return long(s)
_227_re = None _227_re = None