[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[nick.coghlan]

http://hg.python.org/cpython/rev/bfe042a363e6
changeset:   79849:bfe042a363e6
parent:      79847:6ff9eef4e7c3
parent:      79848:4adc11300c05
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sat Oct 20 20:13:42 2012 +1000
summary:
  Merge from 3.3

files:
  Doc/library/concurrent.futures.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -146,7 +146,7 @@
        # Start the load operations and mark each future with its URL
        future_to_url = {executor.submit(load_url, url, 60):url for url in URLS}
        for future in concurrent.futures.as_completed(future_to_url):
-           url = future_to_url[url]
+           url = future_to_url[future]
            try:
                data = future.result()
            except Exception as exc:

-- 
Repository URL: http://hg.python.org/cpython