From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org, John Snow <jsnow@redhat.com>,
Max Reitz <mreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
philmd@redhat.com
Subject: [PATCH v5 05/16] python/qmp.py: add casts to JSON deserialization
Date: Fri, 10 Jul 2020 01:22:09 -0400 [thread overview]
Message-ID: <20200710052220.3306-6-jsnow@redhat.com> (raw)
In-Reply-To: <20200710052220.3306-1-jsnow@redhat.com>
mypy and python type hints are not powerful enough to properly describe
JSON messages in Python 3.6. The best we can do, generally, is describe
them as Dict[str, Any].
Add casts to coerce this type for static analysis; but do NOT enforce
this type at runtime in any way.
Note: Python 3.8 adds a TypedDict construct which allows for the
description of more arbitrary Dictionary shapes. There is a third-party
module, "Pydantic", which is compatible with 3.6 that can be used
instead of the JSON library that parses JSON messages to fully-typed
Python objects, and may be preferable in some cases.
(That is well beyond the scope of this commit or series.)
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
python/qemu/qmp.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index ef3c919b76..1ae36050a4 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -13,6 +13,7 @@
import logging
from typing import (
Any,
+ cast,
Dict,
Optional,
TextIO,
@@ -130,7 +131,10 @@ def __json_read(self, only_event=False):
data = self.__sockfile.readline()
if not data:
return None
- resp = json.loads(data)
+ # By definition, any JSON received from QMP is a QMPMessage,
+ # and we are asserting only at static analysis time that it
+ # has a particular shape.
+ resp: QMPMessage = json.loads(data)
if 'event' in resp:
self.logger.debug("<<< %s", resp)
self.__events.append(resp)
@@ -262,7 +266,7 @@ def command(self, cmd, **kwds):
ret = self.cmd(cmd, kwds)
if 'error' in ret:
raise QMPResponseError(ret)
- return ret['return']
+ return cast(QMPReturnValue, ret['return'])
def pull_event(self, wait=False):
"""
--
2.21.3
next prev parent reply other threads:[~2020-07-10 5:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 5:22 [PATCH v5 00/16] python: add mypy support to python/qemu John Snow
2020-07-10 5:22 ` [PATCH v5 01/16] python/qmp.py: Define common types John Snow
2020-07-10 5:22 ` [PATCH v5 02/16] iotests.py: use qemu.qmp type aliases John Snow
2020-07-10 5:22 ` [PATCH v5 03/16] python/qmp.py: re-absorb MonitorResponseError John Snow
2020-07-10 5:22 ` [PATCH v5 04/16] python/qmp.py: Do not return None from cmd_obj John Snow
2020-07-10 5:22 ` John Snow [this message]
2020-07-10 5:22 ` [PATCH v5 06/16] python/qmp.py: add QMPProtocolError John Snow
2020-07-10 5:22 ` [PATCH v5 07/16] python/machine.py: Fix monitor address typing John Snow
2020-07-10 5:22 ` [PATCH v5 08/16] python/machine.py: reorder __init__ John Snow
2020-07-10 5:22 ` [PATCH v5 09/16] python/machine.py: Don't modify state in _base_args() John Snow
2020-07-10 5:22 ` [PATCH v5 10/16] python/machine.py: Handle None events in events_wait John Snow
2020-07-10 5:22 ` [PATCH v5 11/16] python/machine.py: use qmp.command John Snow
2020-07-10 5:22 ` [PATCH v5 12/16] python/machine.py: Add _qmp access shim John Snow
2020-07-13 9:37 ` Philippe Mathieu-Daudé
2020-07-10 5:22 ` [PATCH v5 13/16] python/machine.py: fix _popen access John Snow
2020-07-13 9:31 ` Philippe Mathieu-Daudé
2020-07-10 5:22 ` [PATCH v5 14/16] python/qemu: make 'args' style arguments immutable John Snow
2020-07-10 5:22 ` [PATCH v5 15/16] iotests.py: Adjust HMP kwargs typing John Snow
2020-07-10 5:22 ` [PATCH v5 16/16] python/qemu: Add mypy type annotations John Snow
2020-07-13 9:36 ` Philippe Mathieu-Daudé
2020-07-14 19:25 ` [PATCH v5 00/16] python: add mypy support to python/qemu Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200710052220.3306-6-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.