summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-27 13:23:26 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-27 13:23:26 (GMT)
commit648bcd706882a5ed83b7455ab3cf68734f92c6a4 (patch)
tree2da19c61e238ecd62565fbcd89ff344531f395f1 /Doc/library
parent1a305fd141ebe4295d554d8b127ab982858a079e (diff)
downloadcpython-648bcd706882a5ed83b7455ab3cf68734f92c6a4.zip
cpython-648bcd706882a5ed83b7455ab3cf68734f92c6a4.tar.gz
cpython-648bcd706882a5ed83b7455ab3cf68734f92c6a4.tar.bz2
Merged revisions 76546 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76546 | antoine.pitrou | 2009-11-27 14:18:34 +0100 (ven., 27 nov. 2009) | 7 lines Issue #6845: Add restart support for binary upload in ftplib. The `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest` argument. Patch by Pablo Mouzo. (note: the patch also adds a test for the rest argument in retrbinary()) ........
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/ftplib.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 31684af..59d5b3c 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -226,14 +226,18 @@ followed by ``lines`` for the text version or ``binary`` for the binary version.
Passive mode is on by default.
-.. method:: FTP.storbinary(cmd, file, blocksize=8192, callback=None)
+.. method:: FTP.storbinary(cmd, file, blocksize=8192, callback=None, rest=None)
Store a file in binary transfer mode. *cmd* should be an appropriate
``STOR`` command: ``"STOR filename"``. *file* is an open file object which is
read until EOF using its :meth:`read` method in blocks of size *blocksize* to
provide the data to be stored. The *blocksize* argument defaults to 8192.
*callback* is an optional single parameter callable that is called
- on each block of data after it is sent.
+ on each block of data after it is sent. *rest* means the same thing as in
+ the :meth:`transfercmd` method.
+
+ .. versionchanged:: 3.2
+ *rest* parameter added.
.. method:: FTP.storlines(cmd, file, callback=None)