summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2013-04-17 11:08:59 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2013-04-17 11:08:59 (GMT)
commitb38897fc91c7f4b80bc2025ade219674d7b78bf3 (patch)
treee57827847e0cfc3fde489a7938576ad9b049fb49 /Lib/multiprocessing
parent643ea53c140e2d2b3e21197fd87c1778131297d0 (diff)
downloadcpython-b38897fc91c7f4b80bc2025ade219674d7b78bf3.zip
cpython-b38897fc91c7f4b80bc2025ade219674d7b78bf3.tar.gz
cpython-b38897fc91c7f4b80bc2025ade219674d7b78bf3.tar.bz2
Fix issue #17707: multiprocessing.Queue's get() method does not block for short timeouts.
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/connection.py2
1 files changed, 1 insertions, 1 deletions
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 @@ else:
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: