PR feedback: swap name of terminate_or_kill to force_shutdown

Author: csm10495

Lib/concurrent/futures/process.py

@@ -629,7 +629,7 @@ class BrokenProcessPool(_base.BrokenExecutor):
 _TERMINATE = "terminate"
 _KILL = "kill"
 
-_TERMINATE_OR_KILL_OPERATION = {
+_SHUTDOWN_CALLBACK_OPERATION = {
     _TERMINATE,
     _KILL
 }
@@ -864,7 +864,7 @@ def shutdown(self, wait=True, *, cancel_futures=False):
 
     shutdown.__doc__ = _base.Executor.shutdown.__doc__
 
-    def _terminate_or_kill_workers(self, operation):
+    def _force_shutdown(self, operation):
         """Attempts to terminate or kill the executor's workers based off the
         given operation. Iterates through all of the current processes and
         performs the relevant task if the process is still alive.
@@ -873,7 +873,7 @@ def _terminate_or_kill_workers(self, operation):
         and no longer usable (for instance, new tasks should not be
         submitted).
         """
-        if operation not in _TERMINATE_OR_KILL_OPERATION:
+        if operation not in _SHUTDOWN_CALLBACK_OPERATION:
             raise ValueError(f"Unsupported operation: {operation!r}")
 
         processes = {}
@@ -914,7 +914,7 @@ def terminate_workers(self):
         and no longer usable (for instance, new tasks should not be
         submitted).
         """
-        return self._terminate_or_kill_workers(operation=_TERMINATE)
+        return self._force_shutdown(operation=_TERMINATE)
 
     def kill_workers(self):
         """Attempts to kill the executor's workers.
@@ -925,4 +925,4 @@ def kill_workers(self):
         and no longer usable (for instance, new tasks should not be
         submitted).
         """
-        return self._terminate_or_kill_workers(operation=_KILL)
+        return self._force_shutdown(operation=_KILL)

Lib/test/test_concurrent_futures/test_process_pool.py

@@ -26,7 +26,7 @@ def __init__(self, mgr):
     def __del__(self):
         self.event.set()
 
-TERMINATE_OR_KILL_PARAMS = [
+FORCE_SHUTDOWN_PARAMS = [
     dict(function_name='terminate_workers'),
     dict(function_name='kill_workers'),
 ]
@@ -235,25 +235,25 @@ def mock_start_new_thread(func, *args, **kwargs):
 
     def test_terminate_workers(self):
         with futures.ProcessPoolExecutor(max_workers=1) as executor:
-            executor._terminate_or_kill_workers = unittest.mock.Mock()
+            executor._force_shutdown = unittest.mock.Mock()
             executor.terminate_workers()
 
-        executor._terminate_or_kill_workers.assert_called_once_with(operation=futures.process._TERMINATE)
+        executor._force_shutdown.assert_called_once_with(operation=futures.process._TERMINATE)
 
     def test_kill_workers(self):
         with futures.ProcessPoolExecutor(max_workers=1) as executor:
-            executor._terminate_or_kill_workers = unittest.mock.Mock()
+            executor._force_shutdown = unittest.mock.Mock()
             executor.kill_workers()
 
-        executor._terminate_or_kill_workers.assert_called_once_with(operation=futures.process._KILL)
+        executor._force_shutdown.assert_called_once_with(operation=futures.process._KILL)
 
-    def test_terminate_or_kill_workers_invalid_op(self):
+    def test_force_shutdown_workers_invalid_op(self):
         with futures.ProcessPoolExecutor(max_workers=1) as executor:
             self.assertRaises(ValueError,
-                              executor._terminate_or_kill_workers,
+                              executor._force_shutdown,
                               operation='invalid operation'),
 
-    @parameterize(*TERMINATE_OR_KILL_PARAMS)
+    @parameterize(*FORCE_SHUTDOWN_PARAMS)
     def test_terminate_kill_workers(self, function_name):
         manager = self.get_context().Manager()
         q = manager.Queue()
@@ -278,7 +278,7 @@ def test_terminate_kill_workers(self, function_name):
 
             self.assertRaises(queue.Empty, q.get, timeout=1)
 
-    @parameterize(*TERMINATE_OR_KILL_PARAMS)
+    @parameterize(*FORCE_SHUTDOWN_PARAMS)
     def test_terminate_kill_workers_dead_workers(self, function_name):
         with futures.ProcessPoolExecutor(max_workers=1) as executor:
             future = executor.submit(os._exit, 1)
@@ -287,7 +287,7 @@ def test_terminate_kill_workers_dead_workers(self, function_name):
             # even though the pool is broken, this shouldn't raise
             getattr(executor, function_name)()
 
-    @parameterize(*TERMINATE_OR_KILL_PARAMS)
+    @parameterize(*FORCE_SHUTDOWN_PARAMS)
     def test_terminate_kill_workers_not_started_yet(self, function_name):
         ctx = self.get_context()
         with unittest.mock.patch.object(ctx, 'Process') as mock_process:
@@ -299,7 +299,7 @@ def test_terminate_kill_workers_not_started_yet(self, function_name):
             mock_process.return_value.kill.assert_not_called()
             mock_process.return_value.terminate.assert_not_called()
 
-    @parameterize(*TERMINATE_OR_KILL_PARAMS)
+    @parameterize(*FORCE_SHUTDOWN_PARAMS)
     def test_terminate_kill_workers_stops_pool(self, function_name):
         with futures.ProcessPoolExecutor(max_workers=1) as executor:
             task = executor.submit(time.sleep, 0)