[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/16] qapi/expr.py: Remove 'info' argument from nested check_
From: |
John Snow |
Subject: |
[PATCH v2 01/16] qapi/expr.py: Remove 'info' argument from nested check_if_str |
Date: |
Mon, 26 Oct 2020 17:36:22 -0400 |
The function can just use the argument from the scope above. Otherwise,
we get shadowed argument errors because the parameter name clashes with
the name of a variable already in-scope.
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 2fcaaa2497a8..35695c4c653b 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -104,7 +104,7 @@ def check_flags(expr, info):
def check_if(expr, info, source):
- def check_if_str(ifcond, info):
+ def check_if_str(ifcond):
if not isinstance(ifcond, str):
raise QAPISemError(
info,
@@ -124,9 +124,9 @@ def check_if_str(ifcond, info):
raise QAPISemError(
info, "'if' condition [] of %s is useless" % source)
for elt in ifcond:
- check_if_str(elt, info)
+ check_if_str(elt)
else:
- check_if_str(ifcond, info)
+ check_if_str(ifcond)
expr['if'] = [ifcond]
--
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, 2020/10/26
- [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 <=
- [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
- [PATCH v2 11/16] qapi/expr.py: enable pylint checks, John Snow, 2020/10/26
- [PATCH v2 12/16] qapi/expr.py: Add docstrings, John Snow, 2020/10/26
- [PATCH v2 13/16] qapi/expr.py: Modify check_keys to accept any Iterable, John Snow, 2020/10/26
- [PATCH v2 14/16] qapi/expr.py: Use tuples instead of lists for static data, John Snow, 2020/10/26
- [PATCH v2 16/16] qapi/expr.py: Use an expression checker dispatch table, John Snow, 2020/10/26