diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:59:07 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:59:07 (GMT) |
| commit | 16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba (patch) | |
| tree | 794a55c65c29332c5994e97428d4ee96d1f5256b /Lib/ftplib.py | |
| parent | 16c41d8520b7993cffa576f9021ff712d80ab825 (diff) | |
| parent | 98472b839674a78b0cbb09f50a61f70019591a4a (diff) | |
| download | cpython-16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba.zip cpython-16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba.tar.gz cpython-16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba.tar.bz2 | |
Merge 3.3, 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 9c173c4..a7f03e8 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -486,7 +486,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: @@ -513,7 +513,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. |