01f9005feb
- Backport aqmp patches from upstream which can fix iotest issues * Patches added: python-aqmp-add-__del__-method-to-legacy.patch python-aqmp-add-_session_guard.patch python-aqmp-add-SocketAddrT-to-package-r.patch python-aqmp-add-socket-bind-step-to-lega.patch python-aqmp-add-start_server-and-accept-.patch python-aqmp-copy-type-definitions-from-q.patch python-aqmp-drop-_bind_hack.patch python-aqmp-fix-docstring-typo.patch python-aqmp-Fix-negotiation-with-pre-oob.patch python-aqmp-fix-race-condition-in-legacy.patch Python-aqmp-fix-type-definitions-for-myp.patch python-aqmp-handle-asyncio.TimeoutError-.patch python-aqmp-refactor-_do_accept-into-two.patch python-aqmp-remove-_new_session-and-_est.patch python-aqmp-rename-accept-to-start_serve.patch python-aqmp-rename-AQMPError-to-QMPError.patch python-aqmp-split-_client_connected_cb-o.patch python-aqmp-squelch-pylint-warning-for-t.patch python-aqmp-stop-the-server-during-disco.patch python-introduce-qmp-shell-wrap-convenie.patch python-machine-raise-VMLaunchFailure-exc.patch python-move-qmp-shell-under-the-AQMP-pac.patch python-move-qmp-utilities-to-python-qemu.patch python-qmp-switch-qmp-shell-to-AQMP.patch python-support-recording-QMP-session-to-.patch python-upgrade-mypy-to-0.780.patch - Drop the patches which are workaround to fix iotest issues * Patches dropped: Revert-python-iotests-replace-qmp-with-a.patch Revert-python-machine-add-instance-disam.patch Revert-python-machine-add-sock_dir-prope.patch Revert-python-machine-handle-fast-QEMU-t.patch Revert-python-machine-move-more-variable.patch Revert-python-machine-remove-_remove_mon.patch OBS-URL: https://build.opensuse.org/request/show/966963 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=708
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From: John Snow <jsnow@redhat.com>
|
|
Date: Mon, 10 Jan 2022 14:13:48 -0500
|
|
Subject: Python/aqmp: fix type definitions for mypy 0.920
|
|
|
|
Git-commit: 42d73f2894ea1855df5a25d58e0d9eac6023dcc3
|
|
|
|
0.920 (Released 2021-12-15) is not entirely happy with the
|
|
way that I was defining _FutureT:
|
|
|
|
qemu/aqmp/protocol.py:601: error: Item "object" of the upper bound
|
|
"Optional[Future[Any]]" of type variable "_FutureT" has no attribute
|
|
"done"
|
|
|
|
Update it with something a little mechanically simpler that works better
|
|
across a wider array of mypy versions.
|
|
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Message-id: 20220110191349.1841027-3-jsnow@redhat.com
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
python/qemu/aqmp/protocol.py | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/python/qemu/aqmp/protocol.py b/python/qemu/aqmp/protocol.py
|
|
index 5190b33b13df24fc2ca4aed934ed..c4fbe35a0e41c589059ec4fa37a8 100644
|
|
--- a/python/qemu/aqmp/protocol.py
|
|
+++ b/python/qemu/aqmp/protocol.py
|
|
@@ -43,8 +43,8 @@ from .util import (
|
|
|
|
|
|
T = TypeVar('T')
|
|
+_U = TypeVar('_U')
|
|
_TaskFN = Callable[[], Awaitable[None]] # aka ``async def func() -> None``
|
|
-_FutureT = TypeVar('_FutureT', bound=Optional['asyncio.Future[Any]'])
|
|
|
|
|
|
class Runstate(Enum):
|
|
@@ -591,7 +591,8 @@ class AsyncProtocol(Generic[T]):
|
|
"""
|
|
Fully reset this object to a clean state and return to `IDLE`.
|
|
"""
|
|
- def _paranoid_task_erase(task: _FutureT) -> Optional[_FutureT]:
|
|
+ def _paranoid_task_erase(task: Optional['asyncio.Future[_U]']
|
|
+ ) -> Optional['asyncio.Future[_U]']:
|
|
# Help to erase a task, ENSURING it is fully quiesced first.
|
|
assert (task is None) or task.done()
|
|
return None if (task and task.done()) else task
|