Kaynağa Gözat

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]
Markus Armbruster 2 yıl önce
ebeveyn
işleme
7c4075190d
1 değiştirilmiş dosya ile 3 ekleme ve 11 silme
  1. 3 11
      scripts/qapi/expr.py

+ 3 - 11
scripts/qapi/expr.py

@@ -335,21 +335,13 @@ def normalize_members(members: object) -> None:
 
 
 def check_type_name(value: Optional[object],
 def check_type_name(value: Optional[object],
                     info: QAPISourceInfo, source: str) -> None:
                     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],
 def check_type_name_or_array(value: Optional[object],
                              info: QAPISourceInfo, source: str) -> None:
                              info: QAPISourceInfo, source: str) -> None:
-    if value is None:
-        return
-
-    if isinstance(value, str):
+    if value is None or isinstance(value, str):
         return
         return
 
 
     if isinstance(value, list):
     if isinstance(value, list):