[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/25] qapi/expr.py: Check for dict instead of OrderedDict
From: |
Markus Armbruster |
Subject: |
[PULL 03/25] qapi/expr.py: Check for dict instead of OrderedDict |
Date: |
Fri, 30 Apr 2021 13:48:16 +0200 |
From: John Snow <jsnow@redhat.com>
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>
Message-Id: <20210421182032.3521476-4-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@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 3fda5d5082..b4bbcd54c0 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.26.3
- [PULL 00/25] QAPI patches patches for 2021-04-30, Markus Armbruster, 2021/04/30
- [PULL 04/25] qapi/expr.py: constrain incoming expression types, Markus Armbruster, 2021/04/30
- [PULL 03/25] qapi/expr.py: Check for dict instead of OrderedDict,
Markus Armbruster <=
- [PULL 08/25] qapi/expr.py: Add casts in a few select cases, Markus Armbruster, 2021/04/30
- [PULL 13/25] qapi/expr.py: enable pylint checks, Markus Armbruster, 2021/04/30
- [PULL 11/25] qapi/expr.py: Consolidate check_if_str calls in check_if, Markus Armbruster, 2021/04/30
- [PULL 06/25] qapi/expr.py: move string check upwards in check_type, Markus Armbruster, 2021/04/30
- [PULL 12/25] qapi/expr.py: Remove single-letter variable, Markus Armbruster, 2021/04/30
- [PULL 14/25] qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names, Markus Armbruster, 2021/04/30
- [PULL 10/25] qapi/expr.py: add type hint annotations, Markus Armbruster, 2021/04/30
- [PULL 09/25] qapi/expr.py: Modify check_keys to accept any Collection, Markus Armbruster, 2021/04/30
- [PULL 01/25] qapi/expr: Comment cleanup, Markus Armbruster, 2021/04/30
- [PULL 16/25] qapi/expr.py: Use tuples instead of lists for static data, Markus Armbruster, 2021/04/30