Fix issue #17707: multiprocessing.Queue's get() method does not block for short timeouts.
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 1d65f46..df57906 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -865,7 +865,7 @@
if hasattr(select, 'poll'):
def _poll(fds, timeout):
if timeout is not None:
- timeout = int(timeout) * 1000 # timeout is in milliseconds
+ timeout = int(timeout * 1000) # timeout is in milliseconds
fd_map = {}
pollster = select.poll()
for fd in fds:
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 3fb07f6..14ec61c 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -698,6 +698,13 @@
for p in workers:
p.join()
+ def test_timeout(self):
+ q = multiprocessing.Queue()
+ start = time.time()
+ self.assertRaises(pyqueue.Empty, q.get, True, 0.2)
+ delta = time.time() - start
+ self.assertGreaterEqual(delta, 0.19)
+
#
#
#
diff --git a/Misc/NEWS b/Misc/NEWS
index 0b118d5..be59be0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@
Library
-------
+- Issue #17707: multiprocessing.Queue's get() method does not block for short
+ timeouts.
+
- Issue #17012: shutil.which() no longer fallbacks to the PATH environment
variable if empty path argument is specified. Patch by Serhiy Storchaka.