[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/20] python/qemu/console_socket.py: Correct type of recv()
From: |
John Snow |
Subject: |
[PATCH 12/20] python/qemu/console_socket.py: Correct type of recv() |
Date: |
Tue, 6 Oct 2020 19:58:09 -0400 |
The type and parameter names of recv() should match socket.socket().
OK, easy enough, but in the cases we don't pass straight through to the
real socket implementation, we probably can't accept such flags. OK, for
now, assert that we don't receive flags in such cases.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/console_socket.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/python/qemu/console_socket.py b/python/qemu/console_socket.py
index 69f604c77fe..cb3400a0385 100644
--- a/python/qemu/console_socket.py
+++ b/python/qemu/console_socket.py
@@ -92,13 +92,14 @@ def _drain_socket(self):
for c in string:
self._buffer.extend(c)
- def recv(self, bufsize=1):
+ def recv(self, bufsize: int = 1, flags: int = 0) -> bytes:
"""Return chars from in memory buffer.
Maintains the same API as socket.socket.recv.
"""
if self._drain_thread is None:
# Not buffering the socket, pass thru to socket.
- return socket.socket.recv(self, bufsize)
+ return socket.socket.recv(self, bufsize, flags)
+ assert not flags, "Cannot pass flags to recv() in drained mode"
start_time = time.time()
while len(self._buffer) < bufsize:
time.sleep(self._sleep_time)
--
2.26.2
- [PATCH 05/20] python/machine.py: Handle None events in events_wait, (continued)
- [PATCH 05/20] python/machine.py: Handle None events in events_wait, John Snow, 2020/10/06
- [PATCH 07/20] python/machine.py: Add _qmp access shim, John Snow, 2020/10/06
- [PATCH 06/20] python/machine.py: use qmp.command, John Snow, 2020/10/06
- [PATCH 10/20] iotests.py: Adjust HMP kwargs typing, John Snow, 2020/10/06
- [PATCH 11/20] python/qemu: Add mypy type annotations, John Snow, 2020/10/06
- [PATCH 12/20] python/qemu/console_socket.py: Correct type of recv(),
John Snow <=
- [PATCH 14/20] python/qemu/console_socket.py: Clarify type of drain_thread, John Snow, 2020/10/06
- [PATCH 13/20] python/qemu/console_socket.py: fix typing of settimeout, John Snow, 2020/10/06
- [PATCH 18/20] python/qemu/qmp.py: re-raise OSError when encountered, John Snow, 2020/10/06