[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/25] qapi/error: Make QAPISourceError 'col' parameter optional
From: |
Markus Armbruster |
Subject: |
[PULL 20/25] qapi/error: Make QAPISourceError 'col' parameter optional |
Date: |
Fri, 30 Apr 2021 13:48:33 +0200 |
From: John Snow <jsnow@redhat.com>
It's already treated as optional, with one direct caller and some
subclass callers passing 'None'. Make it officially optional, which
requires moving the position of the argument to come after all required
parameters.
QAPISemError becomes functionally identical to QAPISourceError. Keep the
name to preserve its semantic meaning and avoid code churn, but remove
the now-useless __init__ wrapper.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210421192233.3542904-4-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/error.py | 8 +++-----
scripts/qapi/schema.py | 3 +--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/scripts/qapi/error.py b/scripts/qapi/error.py
index 38bd7c4dd6..d179a3bd0c 100644
--- a/scripts/qapi/error.py
+++ b/scripts/qapi/error.py
@@ -18,11 +18,11 @@ class QAPIError(Exception):
class QAPISourceError(QAPIError):
"""Error class for all exceptions identifying a source location."""
- def __init__(self, info, col, msg):
+ def __init__(self, info, msg, col=None):
super().__init__()
self.info = info
- self.col = col
self.msg = msg
+ self.col = col
def __str__(self):
loc = str(self.info)
@@ -41,10 +41,8 @@ def __init__(self, parser, msg):
col = (col + 7) % 8 + 1
else:
col += 1
- super().__init__(parser.info, col, msg)
+ super().__init__(parser.info, msg, col)
class QAPISemError(QAPISourceError):
"""Error class for semantic QAPI errors."""
- def __init__(self, info, msg):
- super().__init__(info, None, msg)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index c277fcacc5..3a4172fb74 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -875,8 +875,7 @@ def _def_entity(self, ent):
other_ent = self._entity_dict.get(ent.name)
if other_ent:
if other_ent.info:
- where = QAPISourceError(other_ent.info, None,
- "previous definition")
+ where = QAPISourceError(other_ent.info, "previous definition")
raise QAPISemError(
ent.info,
"'%s' is already defined\n%s" % (ent.name, where))
--
2.26.3
- [PULL 12/25] qapi/expr.py: Remove single-letter variable, (continued)
- [PULL 12/25] qapi/expr.py: Remove single-letter variable, Markus Armbruster, 2021/04/30
- [PULL 14/25] qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names, Markus Armbruster, 2021/04/30
- [PULL 10/25] qapi/expr.py: add type hint annotations, Markus Armbruster, 2021/04/30
- [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 <=
- [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, 2021/04/30
- [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