aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2023-03-16 08:13:17 +0100
committerMarkus Armbruster <armbru@redhat.com>2023-04-24 15:21:39 +0200
commit7c4075190da24a01d9c02f5f59cf0651611bd40f (patch)
tree3de2928790766d06bd6090472b58219fa31dfbd8
parent2a0c975f86a24f18b90fc4d65fe8984253fd4562 (diff)
downloadqemu-7c4075190da24a01d9c02f5f59cf0651611bd40f.zip
qemu-7c4075190da24a01d9c02f5f59cf0651611bd40f.tar.gz
qemu-7c4075190da24a01d9c02f5f59cf0651611bd40f.tar.bz2
qapi: Simplify code a bit after previous commits
Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20230316071325.492471-7-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> [Commit message corrected]
-rw-r--r--scripts/qapi/expr.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 5abeaa1..8a8de9e 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -335,21 +335,13 @@ def normalize_members(members: object) -> None:
def check_type_name(value: Optional[object],
info: QAPISourceInfo, source: str) -> None:
- if value is None:
- return
-
- if isinstance(value, str):
- return
-
- raise QAPISemError(info, "%s should be a type name" % source)
+ if value is not None and not isinstance(value, str):
+ raise QAPISemError(info, "%s should be a type name" % source)
def check_type_name_or_array(value: Optional[object],
info: QAPISourceInfo, source: str) -> None:
- if value is None:
- return
-
- if isinstance(value, str):
+ if value is None or isinstance(value, str):
return
if isinstance(value, list):