summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-25 08:11:13 (GMT)
committerGeorg Brandl <georg@python.org>2014-01-25 08:11:13 (GMT)
commit381c280815b6652d45b2d162e6cc5274846685fc (patch)
treeaff069df519b7ebb24b61e16a3104e508b9fb39b
parentc11435399e7af8317e5a51642ee665347da2b97f (diff)
downloadcpython-381c280815b6652d45b2d162e6cc5274846685fc.zip
cpython-381c280815b6652d45b2d162e6cc5274846685fc.tar.gz
cpython-381c280815b6652d45b2d162e6cc5274846685fc.tar.bz2
#20311: revert changes to 3.3 branch for now until experts have decided how to resolve the issue.
-rw-r--r--Lib/test/test_epoll.py11
-rw-r--r--Misc/NEWS4
-rw-r--r--Modules/selectmodule.c4
3 files changed, 1 insertions, 18 deletions
diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
index 46d2968..871efb2 100644
--- a/Lib/test/test_epoll.py
+++ b/Lib/test/test_epoll.py
@@ -217,17 +217,6 @@ class TestEPoll(unittest.TestCase):
server.close()
ep.unregister(fd)
- def test_timeout_rounding(self):
- # epoll_wait() has a resolution of 1 millisecond, check if the timeout
- # is correctly rounded to the upper bound
- epoll = select.epoll()
- self.addCleanup(epoll.close)
- for timeout in (1e-2, 1e-3, 1e-4):
- t0 = time.monotonic()
- epoll.poll(timeout)
- dt = time.monotonic() - t0
- self.assertGreaterEqual(dt, timeout)
-
def test_main():
support.run_unittest(TestEPoll)
diff --git a/Misc/NEWS b/Misc/NEWS
index cac7561..17db15a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,10 +61,6 @@ Library
- Issue #20374: Fix build with GNU readline >= 6.3.
-- Issue #20311: select.epoll.poll() now rounds the timeout away from zero,
- instead of rounding towards zero. For example, a timeout of one microsecond
- is now rounded to one millisecond, instead of being rounded to zero.
-
- Issue #20262: Warnings are raised now when duplicate names are added in the
ZIP file or too long ZIP file comment is truncated.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index ab2016a..c492224 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1379,9 +1379,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) {