[Python-checkins] cpython (merge 3.2 -> 3.3): Merge ftplib doc fix with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/5ae9a90811ff
changeset:   79495:5ae9a90811ff
branch:      3.3
parent:      79492:a093d39fdda4
parent:      79494:40bd8afa6b29
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Oct 05 14:10:39 2012 +0300
summary:
  Merge ftplib doc fix with 3.2.

files:
  Doc/library/ftplib.rst |  18 +++++++++---------
  1 files changed, 9 insertions(+), 9 deletions(-)


diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -270,12 +270,12 @@
 .. 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 @@
 
    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)

-- 
Repository URL: http://hg.python.org/cpython