diff options
author | John Snow <jsnow@redhat.com> | 2020-10-06 19:58:09 -0400 |
---|---|---|
committer | John Snow <jsnow@redhat.com> | 2020-10-20 09:37:57 -0400 |
commit | ff3513e6329ee0c2e7ea4a862c615cdb9c1ffc1b (patch) | |
tree | 6f55d166469dd84f75facd0d3ff6da3b4d5a930a /python | |
parent | f12a282ff4728c8b66435eaddde589db41745beb (diff) | |
download | qemu-ff3513e6329ee0c2e7ea4a862c615cdb9c1ffc1b.zip qemu-ff3513e6329ee0c2e7ea4a862c615cdb9c1ffc1b.tar.gz qemu-ff3513e6329ee0c2e7ea4a862c615cdb9c1ffc1b.tar.bz2 |
python/qemu/console_socket.py: Correct type of recv()
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>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 20201006235817.3280413-13-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'python')
-rw-r--r-- | python/qemu/console_socket.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/qemu/console_socket.py b/python/qemu/console_socket.py index 69f604c..cb3400a 100644 --- a/python/qemu/console_socket.py +++ b/python/qemu/console_socket.py @@ -92,13 +92,14 @@ class ConsoleSocket(socket.socket): 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) |