mirror of
https://github.com/python/cpython.git
synced 2025-08-27 12:16:04 +00:00
Merged revisions 60176-60209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60178 | georg.brandl | 2008-01-21 22:05:49 +0100 (Mon, 21 Jan 2008) | 2 lines #1715: include sub-extension modules in pydoc text output. ........ r60179 | georg.brandl | 2008-01-21 22:14:21 +0100 (Mon, 21 Jan 2008) | 2 lines Add a "const" to make gcc happy. ........ r60180 | georg.brandl | 2008-01-21 22:19:07 +0100 (Mon, 21 Jan 2008) | 2 lines Add the correct build dir when building with pydebug. ........ r60181 | georg.brandl | 2008-01-21 22:23:15 +0100 (Mon, 21 Jan 2008) | 3 lines Patch #1720595: add T_BOOL to the range of structmember types. Patch by Angelo Mottola, reviewed by MvL, tests by me. ........ r60182 | georg.brandl | 2008-01-21 22:28:32 +0100 (Mon, 21 Jan 2008) | 2 lines Reformat some ugly code. ........ r60187 | brett.cannon | 2008-01-22 00:50:16 +0100 (Tue, 22 Jan 2008) | 4 lines Make's MAKEFLAGS variable is set to a string containing the single-letter arguments to Make. This means there are no hyphens. Fix the '-s' check to silence distutils to now work. ........ r60188 | gregory.p.smith | 2008-01-22 01:19:41 +0100 (Tue, 22 Jan 2008) | 3 lines accepts and closes issue #1221598: adds an optional callback to ftplib.FTP storbinary() and storlines() methods. ........ r60189 | gregory.p.smith | 2008-01-22 02:12:02 +0100 (Tue, 22 Jan 2008) | 2 lines Replace spam.acquire() try: ... finally: spam.release() with "with spam:" ........ r60190 | gregory.p.smith | 2008-01-22 02:20:42 +0100 (Tue, 22 Jan 2008) | 4 lines - Fix Issue #1703448: A joined thread could show up in the threading.enumerate() list after the join() for a brief period until it actually exited. ........ r60193 | georg.brandl | 2008-01-22 08:53:31 +0100 (Tue, 22 Jan 2008) | 2 lines Fix \xhh specs, #1889. ........ r60198 | christian.heimes | 2008-01-22 16:01:25 +0100 (Tue, 22 Jan 2008) | 1 line Fixed a missing (X) in define ........ r60199 | christian.heimes | 2008-01-22 16:25:18 +0100 (Tue, 22 Jan 2008) | 2 lines Don't repeat yourself Added the macros PyModule_AddIntMacro and PyModule_AddStringMacro. They shorten PyModule_AddIntConstant(m, "AF_INET", AF_INET) to PyModule_AddIntMacro(m, AF_INET) ........ r60201 | raymond.hettinger | 2008-01-22 20:51:41 +0100 (Tue, 22 Jan 2008) | 1 line Document when to use izip_longest(). ........ r60202 | georg.brandl | 2008-01-22 20:56:03 +0100 (Tue, 22 Jan 2008) | 2 lines Fix for #1087741 patch. ........ r60203 | raymond.hettinger | 2008-01-22 21:18:53 +0100 (Tue, 22 Jan 2008) | 1 line Give zip() the same guarantee as izip() for left-to-right evaluation. ........ r60204 | raymond.hettinger | 2008-01-22 23:09:26 +0100 (Tue, 22 Jan 2008) | 1 line Improve variable name in sample code ........ r60205 | gregory.p.smith | 2008-01-23 00:15:34 +0100 (Wed, 23 Jan 2008) | 2 lines docstring and comment updates suggested by Giampaolo Rodola' ........ r60207 | raymond.hettinger | 2008-01-23 01:04:40 +0100 (Wed, 23 Jan 2008) | 1 line Let pprint() support sets and frozensets (suggested by David Mertz). ........ r60208 | guido.van.rossum | 2008-01-23 02:18:27 +0100 (Wed, 23 Jan 2008) | 4 lines I'm tired of these tests breaking at Google due to our large number of users and groups in LDAP/NIS. So I'm limiting the extra-heavy part of the tests to passwd/group files with at most 1000 entries. ........
This commit is contained in:
Christian Heimes
parent
1dfde1ddc0
commit
1af737cd1e
24 changed files with 268 additions and 112 deletions
|
|
@ -32,6 +32,7 @@ python ftplib.py -d localhost -l -p -l
|
|||
# Changes and improvements suggested by Steve Majewski.
|
||||
# Modified by Jack to work on the mac.
|
||||
# Modified by Siebren to support docstrings and PASV.
|
||||
# Modified by Phil Schwartz to add storbinary and storlines callbacks.
|
||||
#
|
||||
|
||||
import os
|
||||
|
|
@ -313,7 +314,7 @@ class FTP:
|
|||
expected size may be None if it could not be determined.
|
||||
|
||||
Optional `rest' argument can be a string that is sent as the
|
||||
argument to a RESTART command. This is essentially a server
|
||||
argument to a REST command. This is essentially a server
|
||||
marker used to tell the server to skip over any data up to the
|
||||
given marker.
|
||||
"""
|
||||
|
|
@ -376,14 +377,18 @@ class FTP:
|
|||
return resp
|
||||
|
||||
def retrbinary(self, cmd, callback, blocksize=8192, rest=None):
|
||||
"""Retrieve data in binary mode.
|
||||
"""Retrieve data in binary mode. A new port is created for you.
|
||||
|
||||
`cmd' is a RETR command. `callback' is a callback function is
|
||||
called for each block. No more than `blocksize' number of
|
||||
bytes will be read from the socket. Optional `rest' is passed
|
||||
to transfercmd().
|
||||
Args:
|
||||
cmd: A RETR command.
|
||||
callback: A single parameter callable to be called on each
|
||||
block of data read.
|
||||
blocksize: The maximum number of bytes to read from the
|
||||
socket at one time. [default: 8192]
|
||||
rest: Passed to transfercmd(). [default: None]
|
||||
|
||||
A new port is created for you. Return the response code.
|
||||
Returns:
|
||||
The response code.
|
||||
"""
|
||||
self.voidcmd('TYPE I')
|
||||
conn = self.transfercmd(cmd, rest)
|
||||
|
|
@ -396,11 +401,17 @@ class FTP:
|
|||
return self.voidresp()
|
||||
|
||||
def retrlines(self, cmd, callback = None):
|
||||
'''Retrieve data in line mode.
|
||||
The argument is a RETR or LIST command.
|
||||
The callback function (2nd argument) is called for each line,
|
||||
with trailing CRLF stripped. This creates a new port for you.
|
||||
print_line() is the default callback.'''
|
||||
"""Retrieve data in line mode. A new port is created for you.
|
||||
|
||||
Args:
|
||||
cmd: A RETR, LIST, NLST, or MLSD command.
|
||||
callback: An optional single parameter callable that is called
|
||||
for each line with the trailing CRLF stripped.
|
||||
[default: print_line()]
|
||||
|
||||
Returns:
|
||||
The response code.
|
||||
"""
|
||||
if callback is None: callback = print_line
|
||||
resp = self.sendcmd('TYPE A')
|
||||
conn = self.transfercmd(cmd)
|
||||
|
|
@ -419,19 +430,42 @@ class FTP:
|
|||
conn.close()
|
||||
return self.voidresp()
|
||||
|
||||
def storbinary(self, cmd, fp, blocksize=8192):
|
||||
'''Store a file in binary mode.'''
|
||||
def storbinary(self, cmd, fp, blocksize=8192, callback=None):
|
||||
"""Store a file in binary mode. A new port is created for you.
|
||||
|
||||
Args:
|
||||
cmd: A STOR command.
|
||||
fp: A file-like object with a read(num_bytes) method.
|
||||
blocksize: The maximum data size to read from fp and send over
|
||||
the connection at once. [default: 8192]
|
||||
callback: An optional single parameter callable that is called on
|
||||
on each block of data after it is sent. [default: None]
|
||||
|
||||
Returns:
|
||||
The response code.
|
||||
"""
|
||||
self.voidcmd('TYPE I')
|
||||
conn = self.transfercmd(cmd)
|
||||
while 1:
|
||||
buf = fp.read(blocksize)
|
||||
if not buf: break
|
||||
conn.sendall(buf)
|
||||
if callback: callback(buf)
|
||||
conn.close()
|
||||
return self.voidresp()
|
||||
|
||||
def storlines(self, cmd, fp):
|
||||
'''Store a file in line mode.'''
|
||||
def storlines(self, cmd, fp, callback=None):
|
||||
"""Store a file in line mode. A new port is created for you.
|
||||
|
||||
Args:
|
||||
cmd: A STOR command.
|
||||
fp: A file-like object with a readline() method.
|
||||
callback: An optional single parameter callable that is called on
|
||||
on each line after it is sent. [default: None]
|
||||
|
||||
Returns:
|
||||
The response code.
|
||||
"""
|
||||
self.voidcmd('TYPE A')
|
||||
conn = self.transfercmd(cmd)
|
||||
while 1:
|
||||
|
|
@ -441,6 +475,7 @@ class FTP:
|
|||
if buf[-1] in CRLF: buf = buf[:-1]
|
||||
buf = buf + CRLF
|
||||
conn.sendall(buf)
|
||||
if callback: callback(buf)
|
||||
conn.close()
|
||||
return self.voidresp()
|
||||
|
||||
|
|
@ -505,7 +540,7 @@ class FTP:
|
|||
|
||||
def size(self, filename):
|
||||
'''Retrieve the size of a file.'''
|
||||
# Note that the RFC doesn't say anything about 'SIZE'
|
||||
# The SIZE command is defined in RFC-3659
|
||||
resp = self.sendcmd('SIZE ' + filename)
|
||||
if resp[:3] == '213':
|
||||
s = resp[3:].strip()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue