Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely
when called with a timeout. Patch by Arnaud Ysmal.
diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
index 3280a25..51d9912 100644
--- a/Lib/multiprocessing/queues.py
+++ b/Lib/multiprocessing/queues.py
@@ -126,7 +126,11 @@
if not self._rlock.acquire(block, timeout):
raise Empty
try:
- if not self._poll(block and (deadline-time.time()) or 0.0):
+ if block:
+ timeout = deadline - time.time()
+ if timeout < 0 or not self._poll(timeout):
+ raise Empty
+ elif not self._poll():
raise Empty
res = self._recv()
self._sem.release()
diff --git a/Misc/ACKS b/Misc/ACKS
index 6f2c2a1..2fe9174 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1001,6 +1001,7 @@
Danny Yoo
George Yoshida
Masazumi Yoshikawa
+Arnaud Ysmal
Bernard Yue
Moshe Zadka
Milan Zamazal
diff --git a/Misc/NEWS b/Misc/NEWS
index 19e7960..24840b1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,9 @@
Library
-------
+- Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely
+ when called with a timeout. Patch by Arnaud Ysmal.
+
- Issue #13254: Fix Maildir initialization so that maildir contents
are read correctly.