[3.9] bpo-39349: Add cancel_futures to Executor.shutdown base class (GH-22023) (GH-22048)
* 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.
(cherry picked from commit 17dc1b7
)
This commit is contained in:
parent
27183f48f2
commit
a763ee3c58
|
@ -605,7 +605,7 @@ class Executor(object):
|
||||||
future.cancel()
|
future.cancel()
|
||||||
return result_iterator()
|
return result_iterator()
|
||||||
|
|
||||||
def shutdown(self, wait=True):
|
def shutdown(self, wait=True, *, cancel_futures=False):
|
||||||
"""Clean-up the resources associated with the Executor.
|
"""Clean-up the resources associated with the Executor.
|
||||||
|
|
||||||
It is safe to call this method several times. Otherwise, no other
|
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
|
wait: If True then shutdown will not return until all running
|
||||||
futures have finished executing and the resources used by the
|
futures have finished executing and the resources used by the
|
||||||
executor have been reclaimed.
|
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
|
pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue