[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v3 02/16] qapi/expr.py: Check for dict instead of OrderedDict

From: John Snow
Subject: Re: [PATCH v3 02/16] qapi/expr.py: Check for dict instead of OrderedDict
Date: Wed, 24 Feb 2021 16:23:42 -0500
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0

On 2/24/21 4:30 AM, Markus Armbruster wrote:
John Snow <jsnow@redhat.com> writes:

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.

True.  The actual arguments can only be OrderedDict, though.  I think we
refrained from relaxing to dict in these helpers because we felt
"staying ordered" is clearer.

As a habit, I tend towards declaring the least specific type possible for input and declaring the most specific type possible for output.

We're *this* close to mooting the point, because

     Changed in version 3.7: Dictionary order is guaranteed to be
     insertion order. This behavior was an implementation detail of
     CPython from 3.6.


Is messing with it necessary for later work?  If not, is it a worthwhile

Not strictly necessary, but if the expression checkers here don't *require* the type be an ordereddict, why bother to enforce that here?

It's just a bid to slacken the type (my type hints will look for Dict, not OrderedDict) and leave the use of OrderedDict as an "implementation detail" that only parser.py knows about.

(I needed to change it for prototyping using an off-the-shelf parser, so it was annoying to have it check for a stronger type if it doesn't absolutely have to.)

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 35695c4c653..5694c501fa3 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):
@@ -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)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]