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/concurrent | |
| 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/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 e9f6537..3d03280 100644 --- a/Lib/concurrent/futures/_base.py +++ b/Lib/concurrent/futures/_base.py @@ -517,7 +517,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. |