[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/16] qapi/expr.py: Check type of 'data' member
From: |
John Snow |
Subject: |
[PATCH v3 06/16] qapi/expr.py: Check type of 'data' member |
Date: |
Mon, 22 Feb 2021 19:33:58 -0500 |
Iterating over the members of data isn't going to work if it's not some
form of dict anyway, but for the sake of mypy, formalize it.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qapi/expr.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index c97e8ce8a4d..afa6bd07769 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -254,6 +254,9 @@ def check_union(expr, info):
raise QAPISemError(info, "'discriminator' requires 'base'")
check_name_is_str(discriminator, info, "'discriminator'")
+ if not isinstance(members, dict):
+ raise QAPISemError(info, "'data' must be an object")
+
for (key, value) in members.items():
source = "'data' member '%s'" % key
check_name_str(key, info, source)
@@ -267,6 +270,10 @@ def check_alternate(expr, info):
if not members:
raise QAPISemError(info, "'data' must not be empty")
+
+ if not isinstance(members, dict):
+ raise QAPISemError(info, "'data' must be an object")
+
for (key, value) in members.items():
source = "'data' member '%s'" % key
check_name_str(key, info, source)
--
2.29.2
- Re: [PATCH v3 02/16] qapi/expr.py: Check for dict instead of OrderedDict, (continued)
[PATCH v3 05/16] qapi/expr.py: move string check upwards in check_type, John Snow, 2021/02/22
[PATCH v3 06/16] qapi/expr.py: Check type of 'data' member,
John Snow <=
[PATCH v3 07/16] qapi/expr.py: Add casts in a few select cases, John Snow, 2021/02/22
[PATCH v3 09/16] qapi/expr.py: Consolidate check_if_str calls in check_if, John Snow, 2021/02/22