From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
Date: Tue, 1 Sep 2020 21:18:07 +0000 (-0700)
Subject: bpo-39349: Add cancel_futures to Executor.shutdown base class (GH-22023)
X-Git-Tag: v3.10.0a1~199
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17dc1b789ecc33b4a254eb3b799085f4b3624ca5;p=thirdparty%2FPython%2Fcpython.git

bpo-39349: Add cancel_futures to Executor.shutdown base class (GH-22023)

* Add cancel_futures parameter to the Executor base class, since it was missed in the original PR (https://github.com/python/cpython/pull/18057) that added cancel_futures.
---

diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
index bf546f8ae1d1..00eb54881f29 100644
--- a/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@ -605,7 +605,7 @@ class Executor(object):
                     future.cancel()
         return result_iterator()
 
-    def shutdown(self, wait=True):
+    def shutdown(self, wait=True, *, cancel_futures=False):
         """Clean-up the resources associated with the Executor.
 
         It is safe to call this method several times. Otherwise, no other
@@ -615,6 +615,9 @@ class Executor(object):
             wait: If True then shutdown will not return until all running
                 futures have finished executing and the resources used by the
                 executor have been reclaimed.
+            cancel_futures: If True then shutdown will cancel all pending
+                futures. Futures that are completed or running will not be
+                cancelled.
         """
         pass