diff options
Diffstat (limited to 'kombu/utils/eventio.py')
| -rw-r--r-- | kombu/utils/eventio.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/kombu/utils/eventio.py b/kombu/utils/eventio.py index 9bb4544a..d6149f7e 100644 --- a/kombu/utils/eventio.py +++ b/kombu/utils/eventio.py @@ -1,5 +1,4 @@ """Selector Utilities.""" -from __future__ import absolute_import, unicode_literals import errno import math @@ -57,7 +56,7 @@ except AttributeError: SELECT_BAD_FD = {errno.EBADF} -class _epoll(object): +class _epoll: def __init__(self): self._epoll = epoll() @@ -73,9 +72,9 @@ class _epoll(object): def unregister(self, fd): try: self._epoll.unregister(fd) - except (socket.error, ValueError, KeyError, TypeError): + except (OSError, ValueError, KeyError, TypeError): pass - except (IOError, OSError) as exc: + except OSError as exc: if getattr(exc, 'errno', None) not in (errno.ENOENT, errno.EPERM): raise @@ -90,7 +89,7 @@ class _epoll(object): self._epoll.close() -class _kqueue(object): +class _kqueue: w_fflags = (KQ_NOTE_WRITE | KQ_NOTE_EXTEND | KQ_NOTE_ATTRIB | KQ_NOTE_DELETE) @@ -110,7 +109,7 @@ class _kqueue(object): if events: try: self._control(fd, events, KQ_EV_DELETE) - except socket.error: + except OSError: pass def watch_file(self, fd): @@ -177,7 +176,7 @@ class _kqueue(object): self._kqueue.close() -class _poll(object): +class _poll: def __init__(self): self._poller = xpoll() @@ -200,7 +199,7 @@ class _poll(object): def unregister(self, fd): try: fd = fileno(fd) - except socket.error as exc: + except OSError as exc: # we don't know the previous fd of this object # but it will be removed by the next poll iteration. if getattr(exc, 'errno', None) in SELECT_BAD_FD: @@ -215,7 +214,7 @@ class _poll(object): timeout = 0 if timeout and timeout < 0 else round((timeout or 0) * 1e3) try: event_list = self._quick_poll(timeout) - except (_selecterr, socket.error) as exc: + except (_selecterr, OSError) as exc: if getattr(exc, 'errno', None) == errno.EINTR: return raise @@ -239,7 +238,7 @@ class _poll(object): self._poller = None -class _select(object): +class _select: def __init__(self): self._all = (self._rfd, @@ -260,14 +259,14 @@ class _select(object): for fd in self._rfd | self._wfd | self._efd: try: _selectf([fd], [], [], 0) - except (_selecterr, socket.error) as exc: + except (_selecterr, OSError) as exc: if getattr(exc, 'errno', None) in SELECT_BAD_FD: self.unregister(fd) def unregister(self, fd): try: fd = fileno(fd) - except socket.error as exc: + except OSError as exc: # we don't know the previous fd of this object # but it will be removed by the next poll iteration. if getattr(exc, 'errno', None) in SELECT_BAD_FD: @@ -282,7 +281,7 @@ class _select(object): read, write, error = _selectf( self._rfd, self._wfd, self._efd, timeout, ) - except (_selecterr, socket.error) as exc: + except (_selecterr, OSError) as exc: if getattr(exc, 'errno', None) == errno.EINTR: return elif getattr(exc, 'errno', None) in SELECT_BAD_FD: |