summaryrefslogtreecommitdiff
path: root/kombu/utils/eventio.py
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2012-01-10 15:44:34 +0000
committerAsk Solem <ask@celeryproject.org>2012-01-10 15:46:47 +0000
commita276e1d8829468ae1c5161aace36d3c78ff649c9 (patch)
tree10d70c936cdf5265660cf96f379ca7bf1f6de7ca /kombu/utils/eventio.py
parentccf9563d2468d399c8f69b8282535ead99d46ce3 (diff)
downloadkombu-1.0-archived.tar.gz
eventio poll timeout should be in seconds. Closes #861.0-archived
Diffstat (limited to 'kombu/utils/eventio.py')
-rw-r--r--kombu/utils/eventio.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/kombu/utils/eventio.py b/kombu/utils/eventio.py
index 87b3ec2b..e2241b00 100644
--- a/kombu/utils/eventio.py
+++ b/kombu/utils/eventio.py
@@ -59,7 +59,7 @@ class _epoll(Poller):
pass
def _poll(self, timeout):
- return self._epoll.poll(timeout and timeout / 1000.0 or -1)
+ return self._epoll.poll(timeout or -1)
class _kqueue(Poller):
@@ -84,8 +84,7 @@ class _kqueue(Poller):
flags=flags)], 0)
def _poll(self, timeout):
- kevents = self._kqueue.control(None, 1000,
- timeout and timeout / 1000.0 or timeout)
+ kevents = self._kqueue.control(None, 1000, timeout)
events = {}
for kevent in kevents:
fd = kevent.ident