53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
|
From 5416865eeac72a5dabf91b6c1a70ff7d09e214cf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 20 Nov 2024 10:38:43 +0800
|
||
|
|
Subject: [PATCH] Python/aqmp: fix type definitions for mypy 0.920
|
||
|
|
|
||
|
|
cherry picked from 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: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
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 5190b33b13..c4fbe35a0e 100644
|
||
|
|
--- a/python/qemu/aqmp/protocol.py
|
||
|
|
+++ b/python/qemu/aqmp/protocol.py
|
||
|
|
@@ -43,8 +43,8 @@
|
||
|
|
|
||
|
|
|
||
|
|
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 @@ def _cleanup(self) -> None:
|
||
|
|
"""
|
||
|
|
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
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|