qapi/expr.py: Check for dict instead of OrderedDict

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>
This commit is contained in:
John Snow 2021-04-21 14:20:18 -04:00 committed by Markus Armbruster
parent b7341b89c9
commit 0f231dcf29

View File

@ -14,7 +14,6 @@
# This work is licensed under the terms of the GNU GPL, version 2. # This work is licensed under the terms of the GNU GPL, version 2.
# See the COPYING file in the top-level directory. # See the COPYING file in the top-level directory.
from collections import OrderedDict
import re import re
from .common import c_name from .common import c_name
@ -149,7 +148,7 @@ def check_if(expr, info, source):
def normalize_members(members): def normalize_members(members):
if isinstance(members, OrderedDict): if isinstance(members, dict):
for key, arg in members.items(): for key, arg in members.items():
if isinstance(arg, dict): if isinstance(arg, dict):
continue continue
@ -180,7 +179,7 @@ def check_type(value, info, source,
if not allow_dict: if not allow_dict:
raise QAPISemError(info, "%s should be a type name" % source) raise QAPISemError(info, "%s should be a type name" % source)
if not isinstance(value, OrderedDict): if not isinstance(value, dict):
raise QAPISemError(info, raise QAPISemError(info,
"%s should be an object or type name" % source) "%s should be an object or type name" % source)