[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/20] python/qemu/console_socket.py: fix typing of settimeout
From: |
John Snow |
Subject: |
[PATCH 13/20] python/qemu/console_socket.py: fix typing of settimeout |
Date: |
Tue, 6 Oct 2020 19:58:10 -0400 |
The types and names of the parameters must match the socket.socket interface.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/console_socket.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/python/qemu/console_socket.py b/python/qemu/console_socket.py
index cb3400a0385..39456825064 100644
--- a/python/qemu/console_socket.py
+++ b/python/qemu/console_socket.py
@@ -17,6 +17,7 @@
import socket
import threading
import time
+from typing import Optional
class ConsoleSocket(socket.socket):
@@ -31,6 +32,7 @@ class ConsoleSocket(socket.socket):
"""
def __init__(self, address, file=None, drain=False):
self._recv_timeout_sec = 300
+ self._recv_timeout_sec = 300.0
self._sleep_time = 0.5
self._buffer = deque()
socket.socket.__init__(self, socket.AF_UNIX, socket.SOCK_STREAM)
@@ -120,11 +122,11 @@ def setblocking(self, value):
if self._drain_thread is None:
socket.socket.setblocking(self, value)
- def settimeout(self, seconds):
+ def settimeout(self, value: Optional[float]) -> None:
"""When not draining we pass thru to the socket,
since when draining we control the timeout.
"""
- if seconds is not None:
- self._recv_timeout_sec = seconds
+ if value is not None:
+ self._recv_timeout_sec = value
if self._drain_thread is None:
- socket.socket.settimeout(self, seconds)
+ socket.socket.settimeout(self, value)
--
2.26.2
- Re: [PATCH 06/20] python/machine.py: use qmp.command, (continued)
- [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, 2020/10/06
- [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 <=
- [PATCH 18/20] python/qemu/qmp.py: re-raise OSError when encountered, John Snow, 2020/10/06
- [PATCH 15/20] python/qemu/console_socket.py: Add type hint annotations, John Snow, 2020/10/06
- [PATCH 17/20] python/qemu/qmp.py: Preserve error context on re-raise, John Snow, 2020/10/06