From ce12629c84400c52734859e43b2386deb2b6da12 Mon Sep 17 00:00:00 2001
From: Yury Selivanov <yury@magic.io>
Date: Mon, 13 Nov 2017 13:38:22 -0500
Subject: bpo-28369: Enhance transport socket check in add_reader/writer
 (#4365)

---
 Lib/asyncio/selector_events.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'Lib/asyncio/selector_events.py')

diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index 7143ca2660..00d9a7ede2 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -246,8 +246,16 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
                 self.call_exception_handler(context)
 
     def _ensure_fd_no_transport(self, fd):
+        fileno = fd
+        if not isinstance(fileno, int):
+            try:
+                fileno = int(fileno.fileno())
+            except (AttributeError, TypeError, ValueError):
+                # This code matches selectors._fileobj_to_fd function.
+                raise ValueError("Invalid file object: "
+                                 "{!r}".format(fd)) from None
         try:
-            transport = self._transports[fd]
+            transport = self._transports[fileno]
         except KeyError:
             pass
         else:
-- 
cgit v1.2.1