use InterruptedError instead of catching EINTR

pyftpdlib/_compat.py

@@ -57,6 +57,7 @@ def callable(obj):
 if PY3:
     FileNotFoundError = FileNotFoundError  # NOQA
     FileExistsError = FileExistsError  # NOQA
+    InterruptedError = InterruptedError  # NOQA
 else:
     # https://github.com/PythonCharmers/python-future/blob/exceptions/
     #     src/future/types/exceptions/pep3151.py
@@ -99,6 +100,10 @@ def FileNotFoundError(inst):
     def FileExistsError(inst):
         return getattr(inst, 'errno', _SENTINEL) == errno.EEXIST
 
+    @_instance_checking_exception(EnvironmentError)
+    def InterruptedError(inst):
+        return getattr(inst, 'errno', _SENTINEL) == errno.EINTR
+
     if platform.python_implementation() != "CPython":
         try:
             raise OSError(errno.EEXIST, "perm")

pyftpdlib/ioloop.py

@@ -66,6 +66,7 @@ def handle_accepted(self, sock, addr):
 import traceback
 
 from ._compat import PY3
+from ._compat import InterruptedError
 
 
 try:
@@ -485,10 +486,8 @@ def modify(self, fd, events):
     def poll(self, timeout):
         try:
             r, w, _ = select.select(self._r, self._w, [], timeout)
-        except select.error as err:
-            if getattr(err, "errno", None) == errno.EINTR:
-                return
-            raise
+        except InterruptedError:
+            return
 
         smap_get = self.socket_map.get
         for fd in r:
@@ -564,11 +563,8 @@ def poll(self, timeout):
             timeout = -1  # -1 waits indefinitely
         try:
             events = self._poller.poll(timeout)
-        except (IOError, select.error) as err:
-            # for epoll() and poll() respectively
-            if err.errno == errno.EINTR:
-                return
-            raise
+        except InterruptedError:
+            return
         # localize variable access to minimize overhead
         smap_get = self.socket_map.get
         for fd, event in events:
@@ -767,10 +763,8 @@ def poll(
                 kevents = self._kqueue.control(
                     None, _len(self.socket_map), timeout
                 )
-            except OSError as err:
-                if err.errno == errno.EINTR:
-                    return
-                raise
+            except InterruptedError:
+                return
             for kevent in kevents:
                 inst = self.socket_map.get(kevent.ident)
                 if inst is None:

pyftpdlib/prefork.py

@@ -4,7 +4,6 @@
 
 """Process utils."""
 
-import errno
 import os
 import sys
 import time
@@ -16,6 +15,7 @@
 except ImportError:
     multiprocessing = None
 
+from ._compat import InterruptedError
 from ._compat import long
 from .log import logger
 
@@ -98,10 +98,8 @@ def start_child(i):
     while children:
         try:
             pid, status = os.wait()
-        except OSError as e:
-            if e.errno == errno.EINTR:
-                continue
-            raise
+        except InterruptedError:
+            continue
         if pid not in children:
             continue
         id = children.pop(pid)

pyftpdlib/test/test_ioloop.py

@@ -13,6 +13,7 @@
 
 import pyftpdlib.ioloop
 from pyftpdlib._compat import PY3
+from pyftpdlib._compat import InterruptedError
 from pyftpdlib._compat import super
 from pyftpdlib.ioloop import Acceptor
 from pyftpdlib.ioloop import AsyncChat
@@ -168,9 +169,8 @@ class SelectIOLoopTestCase(PyftpdlibTestCase, BaseIOLoopTestCase):
     def test_select_eintr(self):
         # EINTR is supposed to be ignored
         with mock.patch(
-            'pyftpdlib.ioloop.select.select', side_effect=select.error()
+            'pyftpdlib.ioloop.select.select', side_effect=InterruptedError
         ) as m:
-            m.side_effect.errno = errno.EINTR
             s, rd, wr = self.test_register()
             s.poll(0)
         # ...but just that