[Python-checkins] cpython (merge 3.3 -> default): (Merge 3.3) Issue #20311: Revert 033137c12d88 (02f9db3e684e),
victor.stinner
python-checkins at python.org
Sat Jan 25 14:40:47 CET 2014
http://hg.python.org/cpython/rev/caab3e191485
changeset: 88693:caab3e191485
parent: 88691:7ba9642fc800
parent: 88692:900a1ff323bb
user: Victor Stinner <victor.stinner at gmail.com>
date: Sat Jan 25 14:40:04 2014 +0100
summary:
(Merge 3.3) Issue #20311: Revert 033137c12d88 (02f9db3e684e),
select.epoll.poll() rounds again the timeout towards zero
files:
Lib/test/test_epoll.py | 11 -----------
Misc/NEWS | 4 ----
Modules/selectmodule.c | 4 +---
3 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
--- a/Lib/test/test_epoll.py
+++ b/Lib/test/test_epoll.py
@@ -254,17 +254,6 @@
self.addCleanup(epoll.close)
self.assertEqual(os.get_inheritable(epoll.fileno()), False)
- 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,10 +53,6 @@
- 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
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1458,9 +1458,7 @@
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) {
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list