Skip to content

Commit 4640fa2

Browse files
committed
Remove BaseEventQueue.flush_buf
1 parent bf42a7b commit 4640fa2

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

Lib/_pyrepl/base_eventqueue.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ def empty(self) -> bool:
5454
"""
5555
return not self.events
5656

57-
def flush_buf(self) -> bytes:
58-
"""
59-
Flushes the buffer and returns its contents.
60-
"""
61-
return self.buf.take_bytes() # type: ignore[attr-defined, no-any-return]
62-
6357
def insert(self, event: Event) -> None:
6458
"""
6559
Inserts an event into the queue.
@@ -85,7 +79,7 @@ def push(self, char: int | bytes) -> None:
8579
if isinstance(k, dict):
8680
self.keymap = k
8781
else:
88-
self.insert(Event('key', k, self.flush_buf()))
82+
self.insert(Event('key', k, self.buf.take_bytes()))
8983
self.keymap = self.compiled_keymap
9084

9185
elif self.buf and self.buf[0] == 27: # escape
@@ -95,7 +89,7 @@ def push(self, char: int | bytes) -> None:
9589
trace('unrecognized escape sequence, propagating...')
9690
self.keymap = self.compiled_keymap
9791
self.insert(Event('key', '\033', b'\033'))
98-
for _c in self.flush_buf()[1:]:
92+
for _c in self.buf.take_bytes()[1:]:
9993
self.push(_c)
10094

10195
else:
@@ -104,5 +98,5 @@ def push(self, char: int | bytes) -> None:
10498
except UnicodeError:
10599
return
106100
else:
107-
self.insert(Event('key', decoded, self.flush_buf()))
101+
self.insert(Event('key', decoded, self.buf.take_bytes()))
108102
self.keymap = self.compiled_keymap

Lib/test/test_pyrepl/test_eventqueue.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ def test_empty(self):
3838
eq.insert(Event("key", "a", b"a"))
3939
self.assertFalse(eq.empty())
4040

41-
def test_flush_buf(self):
42-
eq = self.make_eventqueue()
43-
eq.buf.extend(b"test")
44-
self.assertEqual(eq.flush_buf(), b"test")
45-
self.assertEqual(eq.buf, bytearray())
46-
4741
def test_insert(self):
4842
eq = self.make_eventqueue()
4943
event = Event("key", "a", b"a")
@@ -93,7 +87,7 @@ def test_push_with_keymap_in_keymap_and_escape(self, mock_keymap):
9387
eq.push(b"a")
9488
mock_keymap.compile_keymap.assert_called()
9589
self.assertTrue(eq.empty())
96-
eq.flush_buf()
90+
del eq.buf[:]
9791
eq.push(b"\033")
9892
self.assertEqual(eq.events[0].evt, "key")
9993
self.assertEqual(eq.events[0].data, "\033")

0 commit comments

Comments
 (0)