summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2013-04-17 11:12:27 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2013-04-17 11:12:27 (GMT)
commit308307190fa6f81c93ef9bb9d95457d14a6ca098 (patch)
tree26cb44919665dc03933e8c8f6eca2b5ec027466e /Lib/multiprocessing
parent22b9e651c2914dcf511665dd80cc9ce10ca53a1d (diff)
downloadcpython-308307190fa6f81c93ef9bb9d95457d14a6ca098.zip
cpython-308307190fa6f81c93ef9bb9d95457d14a6ca098.tar.gz
cpython-308307190fa6f81c93ef9bb9d95457d14a6ca098.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 4dd6502..47e2123 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -862,7 +862,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: