Consistently use _fileno() throughout

Author: skaslev

qasync/__init__.py

@@ -539,7 +539,7 @@ def _add_writer(self, fd, callback, *args):
             existing.activated["int"].disconnect()
             # will get overwritten by the assignment below anyways
 
-        notifier = QtCore.QSocketNotifier(fd, QtCore.QSocketNotifier.Type.Write)
+        notifier = QtCore.QSocketNotifier(_fileno(fd), QtCore.QSocketNotifier.Type.Write)
         notifier.setEnabled(True)
         self.__log_debug("Adding writer callback for file descriptor %s", fd)
         notifier.activated["int"].connect(

qasync/_unix.py

@@ -9,39 +9,13 @@
 import selectors
 import collections
 
-from . import QtCore, with_logger
+from . import QtCore, with_logger, _fileno
 
 
 EVENT_READ = (1 << 0)
 EVENT_WRITE = (1 << 1)
 
 
-def _fileobj_to_fd(fileobj):
-    """
-    Return a file descriptor from a file object.
-
-    Parameters:
-    fileobj -- file object or file descriptor
-
-    Returns:
-    corresponding file descriptor
-
-    Raises:
-    ValueError if the object is invalid
-
-    """
-    if isinstance(fileobj, int):
-        fd = fileobj
-    else:
-        try:
-            fd = int(fileobj.fileno())
-        except (AttributeError, TypeError, ValueError) as ex:
-            raise ValueError("Invalid file object: {!r}".format(fileobj)) from ex
-    if fd < 0:
-        raise ValueError("Invalid file descriptor: {}".format(fd))
-    return fd
-
-
 class _SelectorMapping(collections.abc.Mapping):
 
     """Mapping of file objects to selector keys."""
@@ -81,14 +55,14 @@ def select(self, *args, **kwargs):
     def _fileobj_lookup(self, fileobj):
         """Return a file descriptor from a file object.
 
-        This wraps _fileobj_to_fd() to do an exhaustive search in case
+        This wraps _fileno() to do an exhaustive search in case
         the object is invalid but we still have it in our map.  This
         is used by unregister() so we can unregister an object that
         was previously registered even if it is closed.  It is also
         used by _SelectorMapping.
         """
         try:
-            return _fileobj_to_fd(fileobj)
+            return _fileno(fileobj)
         except ValueError:
             # Do an exhaustive search.
             for key in self._fd_to_key.values():