[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 3/8] qapi/error: Make QAPISourceError 'col' parameter optional
From: |
John Snow |
Subject: |
[PATCH v3 3/8] qapi/error: Make QAPISourceError 'col' parameter optional |
Date: |
Wed, 21 Apr 2021 15:22:28 -0400 |
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>
---
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 38bd7c4dd6a..d179a3bd0c7 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 c277fcacc53..3a4172fb749 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.30.2
- [PATCH v3 0/8] qapi: static typing conversion, pt4, John Snow, 2021/04/21
- [PATCH v3 1/8] qapi/error: Repurpose QAPIError as an abstract base exception class, John Snow, 2021/04/21
- [PATCH v3 2/8] qapi/error: Use Python3-style super(), John Snow, 2021/04/21
- [PATCH v3 6/8] qapi/error.py: enable pylint checks, John Snow, 2021/04/21
- [PATCH v3 3/8] qapi/error: Make QAPISourceError 'col' parameter optional,
John Snow <=
- [PATCH v3 8/8] qapi/error.py: enable mypy checks, John Snow, 2021/04/21
- [PATCH v3 5/8] qapi/error.py: move QAPIParseError to parser.py, John Snow, 2021/04/21
- [PATCH v3 4/8] qapi/error: assert QAPISourceInfo is not None, John Snow, 2021/04/21
- [PATCH v3 7/8] qapi/error: Add type hints, John Snow, 2021/04/21
- Re: [PATCH v3 0/8] qapi: static typing conversion, pt4, Markus Armbruster, 2021/04/22