[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/16] qapi/expr.py: Check for dict instead of OrderedDict
From: |
John Snow |
Subject: |
[PATCH v2 02/16] qapi/expr.py: Check for dict instead of OrderedDict |
Date: |
Mon, 26 Oct 2020 17:36:23 -0400 |
OrderedDict is a subtype of dict, so we can check for a more general form.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
---
scripts/qapi/expr.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 35695c4c653b..5694c501fa38 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -14,7 +14,6 @@
# This work is licensed under the terms of the GNU GPL, version 2.
# See the COPYING file in the top-level directory.
-from collections import OrderedDict
import re
from .common import c_name
@@ -131,7 +130,7 @@ def check_if_str(ifcond):
def normalize_members(members):
- if isinstance(members, OrderedDict):
+ if isinstance(members, dict):
for key, arg in members.items():
if isinstance(arg, dict):
continue
@@ -162,7 +161,7 @@ def check_type(value, info, source,
if not allow_dict:
raise QAPISemError(info, "%s should be a type name" % source)
- if not isinstance(value, OrderedDict):
+ if not isinstance(value, dict):
raise QAPISemError(info,
"%s should be an object or type name" % 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 <=
- [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, 2020/10/26
- [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