[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 03/17] qapi/expr.py: Check for dict instead of OrderedDict
From: |
John Snow |
Subject: |
[PATCH v5 03/17] qapi/expr.py: Check for dict instead of OrderedDict |
Date: |
Wed, 21 Apr 2021 14:20:18 -0400 |
OrderedDict is a subtype of dict, so we can check for a more general
form. These functions do not themselves depend on it being any
particular type.
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 3fda5d50827..b4bbcd54c08 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
@@ -149,7 +148,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
@@ -180,7 +179,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.30.2
- [PATCH v5 00/17] qapi: static typing conversion, pt3, John Snow, 2021/04/21
- [PATCH v5 01/17] qapi/expr: Comment cleanup, John Snow, 2021/04/21
- [PATCH v5 05/17] qapi/expr.py: Add assertion for union type 'check_dict', John Snow, 2021/04/21
- [PATCH v5 03/17] qapi/expr.py: Check for dict instead of OrderedDict,
John Snow <=
- [PATCH v5 06/17] qapi/expr.py: move string check upwards in check_type, John Snow, 2021/04/21
- [PATCH v5 12/17] qapi/expr.py: Remove single-letter variable, John Snow, 2021/04/21
- [PATCH v5 10/17] qapi/expr.py: add type hint annotations, John Snow, 2021/04/21
- [PATCH v5 07/17] qapi/expr.py: Check type of union and alternate 'data' member, John Snow, 2021/04/21
- [PATCH v5 13/17] qapi/expr.py: enable pylint checks, John Snow, 2021/04/21
- [PATCH v5 09/17] qapi/expr.py: Modify check_keys to accept any Collection, John Snow, 2021/04/21
- [PATCH v5 04/17] qapi/expr.py: constrain incoming expression types, John Snow, 2021/04/21
- [PATCH v5 11/17] qapi/expr.py: Consolidate check_if_str calls in check_if, John Snow, 2021/04/21
- [PATCH v5 16/17] qapi/expr.py: Use tuples instead of lists for static data, John Snow, 2021/04/21
- [PATCH v5 02/17] qapi/expr.py: Remove 'info' argument from nested check_if_str, John Snow, 2021/04/21