summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-01-25 13:40:04 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-01-25 13:40:04 (GMT)
commit38c72bd1996164a6f3f90df998f0b9627b07138a (patch)
treed3a506f366392a302ad3583f880751398dafc6f2 /Modules
parent98c779e8da8fd248a2ccb328f72e45f68406daf6 (diff)
parent933209689e8d07e3ce00c68ca26e001b130f0b62 (diff)
downloadcpython-38c72bd1996164a6f3f90df998f0b9627b07138a.zip
cpython-38c72bd1996164a6f3f90df998f0b9627b07138a.tar.gz
cpython-38c72bd1996164a6f3f90df998f0b9627b07138a.tar.bz2
(Merge 3.3) Issue #20311: Revert 033137c12d88 (02f9db3e684e),
select.epoll.poll() rounds again the timeout towards zero
Diffstat (limited to 'Modules')
-rw-r--r--Modules/selectmodule.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 0c9b9d9..d44e8de 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1458,9 +1458,7 @@ pyepoll_poll(pyEpoll_Object *self, PyObject *args, PyObject *kwds)
return NULL;
}
else {
- /* epoll_wait() has a resolution of 1 millisecond, round away from zero
- to wait *at least* dtimeout seconds. */
- timeout = (int)ceil(dtimeout * 1000.0);
+ timeout = (int)(dtimeout * 1000.0);
}
if (maxevents == -1) {