Issue #23485: select.kqueue.control() is now retried when interrupted by a signal
diff --git a/Lib/selectors.py b/Lib/selectors.py
index 2a0a44c..a3f2e78 100644
--- a/Lib/selectors.py
+++ b/Lib/selectors.py
@@ -549,11 +549,9 @@
def select(self, timeout=None):
timeout = None if timeout is None else max(timeout, 0)
max_ev = len(self._fd_to_key)
+ kev_list = self._kqueue.control(None, max_ev, timeout)
+
ready = []
- try:
- kev_list = self._kqueue.control(None, max_ev, timeout)
- except InterruptedError:
- return ready
for kev in kev_list:
fd = kev.ident
flag = kev.filter
diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py
index 0df9762..4e9b992 100644
--- a/Lib/test/eintrdata/eintr_tester.py
+++ b/Lib/test/eintrdata/eintr_tester.py
@@ -315,8 +315,8 @@
def test_select(self):
t0 = time.monotonic()
select.select([], [], [], self.sleep_time)
- self.stop_alarm()
dt = time.monotonic() - t0
+ self.stop_alarm()
self.assertGreaterEqual(dt, self.sleep_time)
@unittest.skipUnless(hasattr(select, 'poll'), 'need select.poll')
@@ -325,8 +325,8 @@
t0 = time.monotonic()
poller.poll(self.sleep_time * 1e3)
- self.stop_alarm()
dt = time.monotonic() - t0
+ self.stop_alarm()
self.assertGreaterEqual(dt, self.sleep_time)
@unittest.skipUnless(hasattr(select, 'epoll'), 'need select.epoll')
@@ -336,8 +336,19 @@
t0 = time.monotonic()
poller.poll(self.sleep_time)
- self.stop_alarm()
dt = time.monotonic() - t0
+ self.stop_alarm()
+ self.assertGreaterEqual(dt, self.sleep_time)
+
+ @unittest.skipUnless(hasattr(select, 'kqueue'), 'need select.kqueue')
+ def test_kqueue(self):
+ kqueue = select.kqueue()
+ self.addCleanup(kqueue.close)
+
+ t0 = time.monotonic()
+ kqueue.control(None, 1, self.sleep_time)
+ dt = time.monotonic() - t0
+ self.stop_alarm()
self.assertGreaterEqual(dt, self.sleep_time)