changeset:   94121:6e7403bc906f
parent:      94119:4a55b98314cd
parent:      94120:1544bdc409be
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Tue Jan 13 10:00:55 2015 +0100
files:       Lib/selectors.py Lib/test/test_selectors.py Misc/NEWS
description:
Issue #23209, #23225: selectors.BaseSelector.get_key() now raises a
RuntimeError if the selector is closed. And selectors.BaseSelector.close() now
clears its internal reference to the selector mapping to break a reference
cycle. Initial patch written by Martin Richard.


diff -r 4a55b98314cd -r 6e7403bc906f Lib/selectors.py
--- a/Lib/selectors.py	Mon Jan 12 21:03:41 2015 +0100
+++ b/Lib/selectors.py	Tue Jan 13 10:00:55 2015 +0100
@@ -174,6 +174,8 @@
         SelectorKey for this file object
         """
         mapping = self.get_map()
+        if mapping is None:
+            raise RuntimeError('Selector is closed')
         try:
             return mapping[fileobj]
         except KeyError:
@@ -256,6 +258,7 @@
 
     def close(self):
         self._fd_to_key.clear()
+        self._map = None
 
     def get_map(self):
         return self._map
diff -r 4a55b98314cd -r 6e7403bc906f Lib/test/test_selectors.py
--- a/Lib/test/test_selectors.py	Mon Jan 12 21:03:41 2015 +0100
+++ b/Lib/test/test_selectors.py	Tue Jan 13 10:00:55 2015 +0100
@@ -178,14 +178,17 @@
         s = self.SELECTOR()
         self.addCleanup(s.close)
 
+        mapping = s.get_map()
         rd, wr = self.make_socketpair()
 
         s.register(rd, selectors.EVENT_READ)
         s.register(wr, selectors.EVENT_WRITE)
 
         s.close()
-        self.assertRaises(KeyError, s.get_key, rd)
-        self.assertRaises(KeyError, s.get_key, wr)
+        self.assertRaises(RuntimeError, s.get_key, rd)
+        self.assertRaises(RuntimeError, s.get_key, wr)
+        self.assertRaises(KeyError, mapping.__getitem__, rd)
+        self.assertRaises(KeyError, mapping.__getitem__, wr)
 
     def test_get_key(self):
         s = self.SELECTOR()
@@ -252,8 +255,8 @@
             sel.register(rd, selectors.EVENT_READ)
             sel.register(wr, selectors.EVENT_WRITE)
 
-        self.assertRaises(KeyError, s.get_key, rd)
-        self.assertRaises(KeyError, s.get_key, wr)
+        self.assertRaises(RuntimeError, s.get_key, rd)
+        self.assertRaises(RuntimeError, s.get_key, wr)
 
     def test_fileno(self):
         s = self.SELECTOR()
diff -r 4a55b98314cd -r 6e7403bc906f Misc/NEWS
--- a/Misc/NEWS	Mon Jan 12 21:03:41 2015 +0100
+++ b/Misc/NEWS	Tue Jan 13 10:00:55 2015 +0100
@@ -203,6 +203,11 @@
 Library
 -------
 
+- Issue #23209, #23225: selectors.BaseSelector.get_key() now raises a
+  RuntimeError if the selector is closed. And selectors.BaseSelector.close()
+  now clears its internal reference to the selector mapping to break a
+  reference cycle. Initial patch written by Martin Richard.
+
 - Issue #19777: Provide a home() classmethod on Path objects.  Contributed
   by Victor Salgado and Mayank Tripathi.