summaryrefslogtreecommitdiffstats
path: root/Lib/selectors.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-03-31 10:18:35 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-03-31 10:18:35 (GMT)
commit80d84c89ee8f10cd3a5d1dfa2ea1cd51f810ec33 (patch)
treeeb155114bc072c4d0627a4e423b0aee4f6731ace /Lib/selectors.py
parentd5d818d40b9378488dc82150926e20e925acf7fe (diff)
parentb31017331994abcc6af3ce2febfc33593c3d7fec (diff)
downloadcpython-80d84c89ee8f10cd3a5d1dfa2ea1cd51f810ec33.zip
cpython-80d84c89ee8f10cd3a5d1dfa2ea1cd51f810ec33.tar.gz
cpython-80d84c89ee8f10cd3a5d1dfa2ea1cd51f810ec33.tar.bz2
Merge heads
Diffstat (limited to 'Lib/selectors.py')
-rw-r--r--Lib/selectors.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/Lib/selectors.py b/Lib/selectors.py
index 2a0a44c..44a6150 100644
--- a/Lib/selectors.py
+++ b/Lib/selectors.py
@@ -479,11 +479,10 @@ if hasattr(select, 'devpoll'):
# devpoll() has a resolution of 1 millisecond, round away from
# zero to wait *at least* timeout seconds.
timeout = math.ceil(timeout * 1e3)
+
+ fd_event_list = self._devpoll.poll(timeout)
+
ready = []
- try:
- fd_event_list = self._devpoll.poll(timeout)
- except InterruptedError:
- return ready
for fd, event in fd_event_list:
events = 0
if event & ~select.POLLIN:
@@ -549,11 +548,9 @@ if hasattr(select, 'kqueue'):
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