diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-05 11:10:39 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-05 11:10:39 (GMT) |
| commit | b28e75d9d6383ad40c16b2835e65e878d814e239 (patch) | |
| tree | f097169f6e9b3c0e812a1bbbfdafd577895322d9 /Doc/library/ftplib.rst | |
| parent | fd03a099d8b5cc45dc5a3946b6bbb8cedcdb38fc (diff) | |
| parent | cbd449b4160cfc7bb62df6f81a6cc4ec39c943aa (diff) | |
| download | cpython-b28e75d9d6383ad40c16b2835e65e878d814e239.zip cpython-b28e75d9d6383ad40c16b2835e65e878d814e239.tar.gz cpython-b28e75d9d6383ad40c16b2835e65e878d814e239.tar.bz2 | |
Merge ftplib doc fix with 3.2.
Diffstat (limited to 'Doc/library/ftplib.rst')
| -rw-r--r-- | Doc/library/ftplib.rst | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst index 3cc295a..1419af7 100644 --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -270,12 +270,12 @@ followed by ``lines`` for the text version or ``binary`` for the binary version. .. 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 :term:`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. *rest* means the same thing - as in the :meth:`transfercmd` method. + ``STOR`` command: ``"STOR filename"``. *file* is a :term:`file object` + (opened in binary mode) 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. + *rest* means the same thing as in the :meth:`transfercmd` method. .. versionchanged:: 3.2 *rest* parameter added. @@ -285,9 +285,9 @@ followed by ``lines`` for the text version or ``binary`` for the binary version. Store a file in ASCII transfer mode. *cmd* should be an appropriate ``STOR`` command (see :meth:`storbinary`). Lines are read until EOF from the - open :term:`file object` *file* using its :meth:`readline` method to provide - the data to be stored. *callback* is an optional single parameter callable - that is called on each line after it is sent. + :term:`file object` *file* (opened in binary mode) using its :meth:`readline` + method to provide the data to be stored. *callback* is an optional single + parameter callable that is called on each line after it is sent. .. method:: FTP.transfercmd(cmd, rest=None) |