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/concurrent | |
| 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/concurrent')
| -rw-r--r-- | Lib/concurrent/futures/_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py index e997c02..ca3aebd 100644 --- a/Lib/concurrent/futures/_base.py +++ b/Lib/concurrent/futures/_base.py @@ -518,7 +518,7 @@ class Executor(object): """Returns a iterator equivalent to map(fn, iter). Args: - fn: A callable that will take take as many arguments as there are + fn: A callable that will take as many arguments as there are passed iterables. timeout: The maximum number of seconds to wait. If None, then there is no limit on the wait time. |