From 381c280815b6652d45b2d162e6cc5274846685fc Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 25 Jan 2014 09:11:13 +0100
Subject: [PATCH] #20311: revert changes to 3.3 branch for now until experts
 have decided how to resolve the issue.

---
 Lib/test/test_epoll.py | 11 -----------
 Misc/NEWS              |  4 ----
 Modules/selectmodule.c |  4 +---
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
index 46d2968b093..871efb2d314 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 cac7561bb23..17db15aedc4 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 ab2016a9819..c492224ecbc 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) {