mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #23209, #23225: selectors.BaseSelector.get_key() now raises a

Browse source 
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.
This commit is contained in:
Victor Stinner 2015-01-13 10:00:55 +01:00
commit 458fc6f98c
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/selectors.py
View file

@ -174,6 +174,8 @@ class BaseSelector(metaclass=ABCMeta):
SelectorKey for this file object SelectorKey for this file object
""" """
mapping = self.get_map() mapping = self.get_map()
if mapping is None:
raise RuntimeError('Selector is closed')
try: try:
return mapping[fileobj] return mapping[fileobj]
except KeyError: except KeyError:
@ -256,6 +258,7 @@ class _BaseSelectorImpl(BaseSelector):
def close(self): def close(self):
self._fd_to_key.clear() self._fd_to_key.clear()
self._map = None
def get_map(self): def get_map(self):
return self._map return self._map

11
Lib/test/test_selectors.py
View file

@ -178,14 +178,17 @@ class BaseSelectorTestCase(unittest.TestCase):
s = self.SELECTOR() s = self.SELECTOR()
self.addCleanup(s.close) self.addCleanup(s.close)
mapping = s.get_map()
rd, wr = self.make_socketpair() rd, wr = self.make_socketpair()
s.register(rd, selectors.EVENT_READ) s.register(rd, selectors.EVENT_READ)
s.register(wr, selectors.EVENT_WRITE) s.register(wr, selectors.EVENT_WRITE)
s.close() s.close()
self.assertRaises(KeyError, s.get_key, rd) self.assertRaises(RuntimeError, s.get_key, rd)
self.assertRaises(KeyError, s.get_key, wr) self.assertRaises(RuntimeError, s.get_key, wr)
self.assertRaises(KeyError, mapping.__getitem__, rd)
self.assertRaises(KeyError, mapping.__getitem__, wr)
def test_get_key(self): def test_get_key(self):
s = self.SELECTOR() s = self.SELECTOR()
@ -252,8 +255,8 @@ class BaseSelectorTestCase(unittest.TestCase):
sel.register(rd, selectors.EVENT_READ) sel.register(rd, selectors.EVENT_READ)
sel.register(wr, selectors.EVENT_WRITE) sel.register(wr, selectors.EVENT_WRITE)
self.assertRaises(KeyError, s.get_key, rd) self.assertRaises(RuntimeError, s.get_key, rd)
self.assertRaises(KeyError, s.get_key, wr) self.assertRaises(RuntimeError, s.get_key, wr)
def test_fileno(self): def test_fileno(self):
s = self.SELECTOR() s = self.SELECTOR()

5
Misc/NEWS
View file

@ -203,6 +203,11 @@ Core and Builtins
Library 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 - Issue #19777: Provide a home() classmethod on Path objects. Contributed
by Victor Salgado and Mayank Tripathi. by Victor Salgado and Mayank Tripathi.