[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/16] qapi/expr.py: Check type of 'data' member
From: |
John Snow |
Subject: |
[PATCH v2 06/16] qapi/expr.py: Check type of 'data' member |
Date: |
Mon, 26 Oct 2020 17:36:27 -0400 |
Iterating over the members of data isn't going to work if it's not some
form of dict anyway, but for type safety, 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 864363881682..2654a72e8333 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.26.2
- [PATCH v2 00/16] qapi: static typing conversion, pt3, John Snow, 2020/10/26
- [PATCH v2 02/16] qapi/expr.py: Check for dict instead of OrderedDict, John Snow, 2020/10/26
- [PATCH v2 03/16] qapi/expr.py: constrain incoming expression types, John Snow, 2020/10/26
- [PATCH v2 04/16] qapi/expr.py: Add assertion for union type 'check_dict', John Snow, 2020/10/26
- [PATCH v2 05/16] qapi/expr.py: move string check upwards in check_type, John Snow, 2020/10/26
- [PATCH v2 06/16] qapi/expr.py: Check type of 'data' member,
John Snow <=
- [PATCH v2 01/16] qapi/expr.py: Remove 'info' argument from nested check_if_str, John Snow, 2020/10/26
- [PATCH v2 07/16] qapi/expr.py: Add casts in a few select cases, John Snow, 2020/10/26
- [PATCH v2 08/16] qapi/expr.py: add type hint annotations, John Snow, 2020/10/26
- [PATCH v2 09/16] qapi/expr.py: rewrite check_if, John Snow, 2020/10/26
- [PATCH v2 15/16] qapi/expr.py: move related checks inside check_xxx functions, John Snow, 2020/10/26
- [PATCH v2 10/16] qapi/expr.py: Remove single-letter variable, John Snow, 2020/10/26
- [PATCH v2 11/16] qapi/expr.py: enable pylint checks, John Snow, 2020/10/26
- [PATCH v2 12/16] qapi/expr.py: Add docstrings, John Snow, 2020/10/26
- [PATCH v2 13/16] qapi/expr.py: Modify check_keys to accept any Iterable, John Snow, 2020/10/26
- [PATCH v2 14/16] qapi/expr.py: Use tuples instead of lists for static data, John Snow, 2020/10/26