Merge heads.

Doc/library/concurrent.futures.rst

@@ -136,20 +136,25 @@ ThreadPoolExecutor Example
            'http://www.bbc.co.uk/',
            'http://some-made-up-domain.com/']
 
+   # Retrieve a single page and report the url and contents
    def load_url(url, timeout):
-       return urllib.request.urlopen(url, timeout=timeout).read()
+       conn = urllib.request.urlopen(url, timeout=timeout)
+       return conn.readall()
 
+   # We can use a with statement to ensure threads are cleaned up promptly
    with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-       future_to_url = dict((executor.submit(load_url, url, 60), url)
+       # Start the load operations and mark each future with its URL
-                            for url in URLS)
+       load_urls = [executor.submit(load_url, url, 60) for url in URLS]
-
+       for future, url in zip(load_urls, URLS):
-       for future in concurrent.futures.as_completed(future_to_url):
+           future.url = url
-           url = future_to_url[future]
+       for future in concurrent.futures.as_completed(load_urls):
-           if future.exception() is not None:
+           url = future.url
-               print('%r generated an exception: %s' % (url,
+           try:
-                                                        future.exception()))
+               data = future.result()
+           except Exception as exc:
+               print('%r generated an exception: %s' % (url, exc))
            else:
-               print('%r page is %d bytes' % (url, len(future.result())))
+               print('%r page is %d bytes' % (url, len(data)))
 
 
 ProcessPoolExecutor

Misc/NEWS

@@ -143,6 +143,9 @@ Build
 Documentation
 -------------
 
+- Additional comments and some style changes in the concurrent.futures URL
+  retrieval example
+
 - Issue #16115: Improve subprocess.Popen() documentation around args, shell,
   and executable arguments.