summaryrefslogtreecommitdiff
path: root/Lib/concurrent
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 17:58:27 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 17:58:27 -0400
commit98472b839674a78b0cbb09f50a61f70019591a4a (patch)
tree7644852bcc4bcb5833aec9b1dfd8a419f60d0446 /Lib/concurrent
parent09b7503bc999b2c65c9d61465cd19758ff97c0c4 (diff)
parentc30b7b16ea03ad094917615940cd1a9ef53c4904 (diff)
downloadcpython-git-98472b839674a78b0cbb09f50a61f70019591a4a.tar.gz
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.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
index e997c02b43..ca3aebd9c7 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.