[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/13] qapi/parser: fix unused check_args_section arguments
From: |
Markus Armbruster |
Subject: |
[PULL 03/13] qapi/parser: fix unused check_args_section arguments |
Date: |
Sat, 2 Oct 2021 11:56:45 +0200 |
From: John Snow <jsnow@redhat.com>
Pylint informs us we're not using these arguments. Oops, it's
right. Correct the error message and remove the remaining unused
parameter.
Fix test output now that the error message is improved.
Fixes: e151941d1b
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210930205716.1148693-4-jsnow@redhat.com>
[Commit message formatting tweaked]
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/parser.py | 16 +++++++++-------
tests/qapi-schema/doc-bad-feature.err | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index f03ba2cfec..bfd2dbfd9a 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -753,16 +753,18 @@ def check_expr(self, expr):
def check(self):
- def check_args_section(args, info, what):
+ def check_args_section(args, what):
bogus = [name for name, section in args.items()
if not section.member]
if bogus:
raise QAPISemError(
self.info,
- "documented member%s '%s' %s not exist"
- % ("s" if len(bogus) > 1 else "",
- "', '".join(bogus),
- "do" if len(bogus) > 1 else "does"))
+ "documented %s%s '%s' %s not exist" % (
+ what,
+ "s" if len(bogus) > 1 else "",
+ "', '".join(bogus),
+ "do" if len(bogus) > 1 else "does"
+ ))
- check_args_section(self.args, self.info, 'members')
- check_args_section(self.features, self.info, 'features')
+ check_args_section(self.args, 'member')
+ check_args_section(self.features, 'feature')
diff --git a/tests/qapi-schema/doc-bad-feature.err
b/tests/qapi-schema/doc-bad-feature.err
index e4c62adfa3..49d1746c3d 100644
--- a/tests/qapi-schema/doc-bad-feature.err
+++ b/tests/qapi-schema/doc-bad-feature.err
@@ -1 +1 @@
-doc-bad-feature.json:3: documented member 'a' does not exist
+doc-bad-feature.json:3: documented feature 'a' does not exist
--
2.31.1
- [PULL 02/13] qapi/gen: use dict.items() to iterate over _modules, (continued)
- [PULL 02/13] qapi/gen: use dict.items() to iterate over _modules, Markus Armbruster, 2021/10/02
- [PULL 07/13] qapi/parser: Introduce NullSection, Markus Armbruster, 2021/10/02
- [PULL 11/13] qapi/parser: enable mypy checks, Markus Armbruster, 2021/10/02
- [PULL 12/13] qapi/parser: Silence too-few-public-methods warning, Markus Armbruster, 2021/10/02
- [PULL 01/13] qapi/pylintrc: ignore 'consider-using-f-string' warning, Markus Armbruster, 2021/10/02
- [PULL 04/13] qapi: Add spaces after symbol declaration for consistency, Markus Armbruster, 2021/10/02
- [PULL 09/13] qapi/parser: add type hint annotations (QAPIDoc), Markus Armbruster, 2021/10/02
- [PULL 06/13] qapi/parser: clarify _end_section() logic, Markus Armbruster, 2021/10/02
- [PULL 13/13] qapi/parser: enable pylint checks, Markus Armbruster, 2021/10/02
- [PULL 05/13] qapi/parser: remove FIXME comment from _append_body_line, Markus Armbruster, 2021/10/02
- [PULL 03/13] qapi/parser: fix unused check_args_section arguments,
Markus Armbruster <=
- [PULL 10/13] qapi/parser: Add FIXME for consolidating JSON-related types, Markus Armbruster, 2021/10/02
- [PULL 08/13] qapi/parser: add import cycle workaround, Markus Armbruster, 2021/10/02
- Re: [PULL 00/13] QAPI patches patches for 2021-10-02, Richard Henderson, 2021/10/02