[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/25] qapi/expr.py: Remove 'info' argument from nested check_if_s
From: |
Markus Armbruster |
Subject: |
[PULL 02/25] qapi/expr.py: Remove 'info' argument from nested check_if_str |
Date: |
Fri, 30 Apr 2021 13:48:15 +0200 |
From: John Snow <jsnow@redhat.com>
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>
Message-Id: <20210421182032.3521476-3-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@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 c207481f7e..3fda5d5082 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -122,7 +122,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,
@@ -142,9 +142,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.3
- [PULL 09/25] qapi/expr.py: Modify check_keys to accept any Collection, (continued)
- [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
- [PULL 05/25] qapi/expr.py: Add assertion for union type 'check_dict', Markus Armbruster, 2021/04/30
- [PULL 25/25] qapi/error.py: enable mypy checks, Markus Armbruster, 2021/04/30
- [PULL 19/25] qapi/error: Use Python3-style super(), Markus Armbruster, 2021/04/30
- [PULL 23/25] qapi/error.py: enable pylint checks, Markus Armbruster, 2021/04/30
- [PULL 20/25] qapi/error: Make QAPISourceError 'col' parameter optional, Markus Armbruster, 2021/04/30
- [PULL 22/25] qapi/error.py: move QAPIParseError to parser.py, Markus Armbruster, 2021/04/30
- [PULL 24/25] qapi/error: Add type hints, Markus Armbruster, 2021/04/30
- [PULL 02/25] qapi/expr.py: Remove 'info' argument from nested check_if_str,
Markus Armbruster <=
- [PULL 07/25] qapi/expr.py: Check type of union and alternate 'data' member, Markus Armbruster, 2021/04/30
- [PULL 15/25] qapi/expr.py: Add docstrings, Markus Armbruster, 2021/04/30
- [PULL 17/25] qapi/expr: Update authorship and copyright information, Markus Armbruster, 2021/04/30
- [PULL 21/25] qapi/error: assert QAPISourceInfo is not None, Markus Armbruster, 2021/04/30
- [PULL 18/25] qapi/error: Repurpose QAPIError as an abstract base exception class, Markus Armbruster, 2021/04/30
- Re: [PULL 00/25] QAPI patches patches for 2021-04-30, Peter Maydell, 2021/04/30