diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2023-09-26 07:06:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 07:06:07 (GMT) |
| commit | 0b4e090422db5f959184353d53552d1675f74212 (patch) | |
| tree | c6e7757039d019b299cf1082c2d815eae1f1392c | |
| parent | 4091deba88946841044b0a54090492a2fd903d42 (diff) | |
| download | cpython-0b4e090422db5f959184353d53552d1675f74212.zip cpython-0b4e090422db5f959184353d53552d1675f74212.tar.gz cpython-0b4e090422db5f959184353d53552d1675f74212.tar.bz2 | |
gh-109370: Fix unexpected traceback output in test_concurrent_futures (GH-109780)
Follow-up of gh-107219.
* Only close the connection writer on Windows.
* Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of
WSA_OPERATION_ABORTED.
| -rw-r--r-- | Lib/concurrent/futures/process.py | 3 | ||||
| -rw-r--r-- | Lib/multiprocessing/connection.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py index 48d8db3..011e79a 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -521,7 +521,8 @@ class _ExecutorManagerThread(threading.Thread): # gh-107219: Close the connection writer which can unblock # Queue._feed() if it was stuck in send_bytes(). - self.call_queue._writer.close() + if sys.platform == 'win32': + self.call_queue._writer.close() # clean up resources self.join_executor_internals() diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index 7c425a2..dbbf106 100644 --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -42,7 +42,6 @@ except ImportError: BUFSIZE = 8192 # A very generous timeout when it comes to local connections... CONNECTION_TIMEOUT = 20. -WSA_OPERATION_ABORTED = 995 _mmap_counter = itertools.count() @@ -300,7 +299,7 @@ if _winapi: finally: self._send_ov = None nwritten, err = ov.GetOverlappedResult(True) - if err == WSA_OPERATION_ABORTED: + if err == _winapi.ERROR_OPERATION_ABORTED: # close() was called by another thread while # WaitForMultipleObjects() was waiting for the overlapped # operation. |