diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:58:27 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:58:27 (GMT) |
| commit | 98472b839674a78b0cbb09f50a61f70019591a4a (patch) | |
| tree | 7644852bcc4bcb5833aec9b1dfd8a419f60d0446 /Lib/ftplib.py | |
| parent | 09b7503bc999b2c65c9d61465cd19758ff97c0c4 (diff) | |
| parent | c30b7b16ea03ad094917615940cd1a9ef53c4904 (diff) | |
| download | cpython-98472b839674a78b0cbb09f50a61f70019591a4a.zip cpython-98472b839674a78b0cbb09f50a61f70019591a4a.tar.gz cpython-98472b839674a78b0cbb09f50a61f70019591a4a.tar.bz2 | |
Merge 3.2, issue #17047: remove doubled words found in 2.7 to
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
Diffstat (limited to 'Lib/ftplib.py')
| -rw-r--r-- | Lib/ftplib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 5efae95..741e647 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -466,7 +466,7 @@ class FTP: 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] + each block of data after it is sent. [default: None] rest: Passed to transfercmd(). [default: None] Returns: @@ -488,7 +488,7 @@ class FTP: 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] + each line after it is sent. [default: None] Returns: The response code. |