[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 01/13] python/aqmp: Fix wait_closed work-around for python 3.6
|
From: |
G S Niteesh Babu |
|
Subject: |
[PATCH v3 01/13] python/aqmp: Fix wait_closed work-around for python 3.6 |
|
Date: |
Sat, 31 Jul 2021 01:48:34 +0530 |
Before this patch the wait_closed work-around for python 3.6
fails during disconnect.
This is a temproray work around for which might be fixed in the
future or will be completely removed when the minimum python
version is raised to 3.7.
This patch was originally written by John Snow <jsnow@redhat.com>
Signed-off-by: G S Niteesh Babu <niteesh.gs@gmail.com>
---
python/qemu/aqmp/util.py | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/python/qemu/aqmp/util.py b/python/qemu/aqmp/util.py
index de0df44cbd..eaa5fc7d5f 100644
--- a/python/qemu/aqmp/util.py
+++ b/python/qemu/aqmp/util.py
@@ -134,7 +134,17 @@ def is_closing(writer: asyncio.StreamWriter) -> bool:
while not transport.is_closing():
await asyncio.sleep(0)
- await flush(writer)
+
+ # This is an ugly workaround, but it's the best I can come up with.
+ sock = transport.get_extra_info('socket')
+
+ if sock is None:
+ # Our transport doesn't have a socket? ...
+ # Nothing we can reasonably do.
+ return
+
+ while sock.fileno() != -1:
+ await asyncio.sleep(0)
def asyncio_run(coro: Coroutine[Any, Any, T], *, debug: bool = False) -> T:
--
2.17.1
- [PATCH v3 00/13] AQMP TUI Draft, G S Niteesh Babu, 2021/07/30
- [PATCH v3 01/13] python/aqmp: Fix wait_closed work-around for python 3.6,
G S Niteesh Babu <=
- [PATCH v3 02/13] python: disable pylint errors for aqmp-tui, G S Niteesh Babu, 2021/07/30
- [PATCH v3 03/13] python: Add dependencies for AQMP TUI, G S Niteesh Babu, 2021/07/30
- [PATCH v3 04/13] python/aqmp-tui: Add AQMP TUI draft, G S Niteesh Babu, 2021/07/30
- [PATCH v3 05/13] python: add entry point for aqmp-tui, G S Niteesh Babu, 2021/07/30
- [PATCH v3 06/13] python/aqmp-tui: Added type annotations for aqmp-tui, G S Niteesh Babu, 2021/07/30
- [PATCH v3 07/13] python: add optional pygments dependency, G S Niteesh Babu, 2021/07/30
- [PATCH v3 08/13] python/aqmp-tui: add syntax highlighting, G S Niteesh Babu, 2021/07/30
- [PATCH v3 09/13] python/aqmp-tui: Add QMP connection manager, G S Niteesh Babu, 2021/07/30
- [PATCH v3 10/13] python/aqmp-tui: Add scrolling to history box, G S Niteesh Babu, 2021/07/30
- [PATCH v3 11/13] python/aqmp-tui: Add ability to highlight messages, G S Niteesh Babu, 2021/07/30