mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

(ftplib.py): Added parse150() function and FTP.ntransfercmd(). This allows

Browse source 
access to the expected size of a transfer when available.
This commit is contained in:
Fred Drake 1997-01-10 18:26:09 +00:00
parent 80dd9b6672
commit 4de02d9722
1 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Lib/ftplib.py
View file

@ -245,13 +245,16 @@ class FTP:
resp = self.sendport(host, port) resp = self.sendport(host, port)
return sock return sock
def transfercmd(self, cmd): def ntransfercmd(self, cmd):
'''Initiate a transfer over the data connection. '''Initiate a transfer over the data connection.
If the transfer is active, send a port command and If the transfer is active, send a port command and
the transfer command, and accept the connection. the transfer command, and accept the connection.
If the server is passive, send a pasv command, connect If the server is passive, send a pasv command, connect
to it, and start the transfer command. to it, and start the transfer command.
Either way, return the socket for the connection''' Either way, return the socket for the connection and
the expected size of the transfer. The expected size
may be None if it could not be determined.'''
size = None
if self.passiveserver: if self.passiveserver:
host, port = parse227(self.sendcmd('PASV')) host, port = parse227(self.sendcmd('PASV'))
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM) conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@ -265,7 +268,15 @@ class FTP:
if resp[0] <> '1': if resp[0] <> '1':
raise error_reply, resp raise error_reply, resp
conn, sockaddr = sock.accept() conn, sockaddr = sock.accept()
return conn if resp[:3] == '150':
# this is conditional in case we received a 125
size = parse150(resp)
return conn, size
def transfercmd(self, cmd):
'''Initiate a transfer over the data connection. Returns
the socket for the connection. See also ntransfercmd().'''
return self.ntransfercmd(cmd)[0]
def login(self, user = '', passwd = '', acct = ''): def login(self, user = '', passwd = '', acct = ''):
'''Login, default anonymous.''' '''Login, default anonymous.'''
@ -450,6 +461,22 @@ class FTP:
del self.file, self.sock del self.file, self.sock
import regex
_150_re = regex.compile("150 .* (\([0-9][0-9]*\) bytes)", regex.casefold)
def parse150(resp):
'''Parse the '150' response for a RETR request.
Returns the expected transfer size or None; size is not guaranteed to
be present in the 150 message.
'''
if resp[:3] != '150':
raise error_reply, resp
length = _150_re.match(resp)
if length >= 0:
return string.atoi(_150_re.group(1))
return None
def parse227(resp): def parse227(resp):
'''Parse the '227' response for a PASV request. '''Parse the '227' response for a PASV request.
Raises error_proto if it does not contain '(h1,h2,h3,h4,p1,p2)' Raises error_proto if it does not contain '(h1,h2,h3,h4,p1,p2)'