From d4c5b429fd18d30f2e23aef6e944fe40f2319024 Mon Sep 17 00:00:00 2001 From: John Snow Date: Mon, 15 Feb 2021 21:17:58 -0500 Subject: qapi/introspect.py: Always define all 'extra' dict keys This mimics how a typed object works, where 'if' and 'comment' are always set, regardless of if they have a value set or not. It is safe to do this because of the way that _tree_to_qlit processes these values (using dict.get with a default of None), resulting in no change of output from _tree_to_qlit. There are no other users of this data. Signed-off-by: John Snow <jsnow@redhat.com> Message-Id: <20210216021809.134886-9-jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- scripts/qapi/introspect.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index c4326d42cb..88af5383d5 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -27,11 +27,10 @@ from .schema import ( def _make_tree(obj, ifcond, comment=None): - extra = {} - if ifcond: - extra['if'] = ifcond - if comment: - extra['comment'] = comment + extra = { + 'if': ifcond, + 'comment': comment + } return (obj, extra) -- cgit v1.2.3-55-g7522