Skip to content

gh-106664: selectors: add get method to _SelectorMapping #106665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 8 commits into from
Jul 13, 2023
Merged

gh-106664: selectors: add get method to _SelectorMapping #106665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5a8848
Reduce overhead to add new selectors
bdraco Jul 12, 2023
206dd38
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 12, 2023
005ae06
direct get coverage
bdraco Jul 12, 2023
b6bacd3
Merge remote-tracking branch 'origin/selectors_add_reader_perf' into …
bdraco Jul 12, 2023
820cb8e
fix test order
bdraco Jul 12, 2023
5d21584
Update Lib/selectors.py
bdraco Jul 12, 2023
f0b59e3
Update Misc/NEWS.d/next/Library/2023-07-12-03-04-45.gh-issue-106664.Z…
bdraco Jul 12, 2023
8220fc6
Update Misc/NEWS.d/next/Library/2023-07-12-03-04-45.gh-issue-106664.Z…
methane Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Lib/selectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,16 @@ def __init__(self, selector):
def __len__(self):
return len(self._selector._fd_to_key)

def get(self, fileobj, default=None):
fd = self._selector._fileobj_lookup(fileobj)
return self._selector._fd_to_key.get(fd, default)

def __getitem__(self, fileobj):
try:
fd = self._selector._fileobj_lookup(fileobj)
return self._selector._fd_to_key[fd]
except KeyError:
raise KeyError("{!r} is not registered".format(fileobj)) from None
fd = self._selector._fileobj_lookup(fileobj)
key = self._selector._fd_to_key.get(fd)
if key is None:
raise KeyError("{!r} is not registered".format(fileobj))
return key

def __iter__(self):
return iter(self._selector._fd_to_key)
Expand Down
6 changes: 6 additions & 0 deletions Lib/test/test_selectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ def test_close(self):
self.assertRaises(RuntimeError, s.get_key, wr)
self.assertRaises(KeyError, mapping.__getitem__, rd)
self.assertRaises(KeyError, mapping.__getitem__, wr)
self.assertEqual(mapping.get(rd), None)
self.assertEqual(mapping.get(wr), None)

def test_get_key(self):
s = self.SELECTOR()
Expand All @@ -241,13 +243,17 @@ def test_get_map(self):
self.addCleanup(s.close)

rd, wr = self.make_socketpair()
sentinel = object()

keys = s.get_map()
self.assertFalse(keys)
self.assertEqual(len(keys), 0)
self.assertEqual(list(keys), [])
self.assertEqual(keys.get(rd), None)
self.assertEqual(keys.get(rd, sentinel), sentinel)
key = s.register(rd, selectors.EVENT_READ, "data")
self.assertIn(rd, keys)
self.assertEqual(key, keys.get(rd))
self.assertEqual(key, keys[rd])
self.assertEqual(len(keys), 1)
self.assertEqual(list(keys), [rd.fileno()])
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-07-12-03-04-45.gh-issue-106664.ZeUG78.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:mod:`selectors`: Add ``_SelectorMapping.get()`` method and optimize ``_SelectorMapping.__getitem__()``.