[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] qapi: Drop Indentation.__bool__()
From: |
Markus Armbruster |
Subject: |
[PULL 2/5] qapi: Drop Indentation.__bool__() |
Date: |
Mon, 13 Sep 2021 11:50:35 +0200 |
Intentation.__bool__() is not worth its keep: it has just one user,
which can just as well check .__str__() instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210908045428.2689093-3-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/common.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index c4d11b9637..1d62c27fb7 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -142,10 +142,6 @@ def __str__(self) -> str:
"""Return the current indentation as a string of spaces."""
return ' ' * self._level
- def __bool__(self) -> bool:
- """True when there is a non-zero indentation."""
- return bool(self._level)
-
def increase(self, amount: int = 4) -> None:
"""Increase the indentation level by ``amount``, default 4."""
self._level += amount
@@ -169,8 +165,9 @@ def cgen(code: str, **kwds: object) -> str:
Obey `indent`, and strip `EATSPACE`.
"""
raw = code % kwds
- if indent:
- raw = re.sub(r'^(?!(#|$))', str(indent), raw, flags=re.MULTILINE)
+ pfx = str(indent)
+ if pfx:
+ raw = re.sub(r'^(?!(#|$))', pfx, raw, flags=re.MULTILINE)
return re.sub(re.escape(EATSPACE) + r' *', '', raw)
--
2.31.1
- [PULL 0/5] QAPI patches patches for 2021-09-13, Markus Armbruster, 2021/09/13
- [PULL 5/5] qapi: Fix bogus error for 'if': { 'not': '' }, Markus Armbruster, 2021/09/13
- [PULL 3/5] qapi: Bury some unused code in class Indentation, Markus Armbruster, 2021/09/13
- [PULL 4/5] tests/qapi-schema: Cover 'not' condition with empty argument, Markus Armbruster, 2021/09/13
- [PULL 1/5] qapi: Fix a botched type annotation, Markus Armbruster, 2021/09/13
- [PULL 2/5] qapi: Drop Indentation.__bool__(),
Markus Armbruster <=
- Re: [PULL 0/5] QAPI patches patches for 2021-09-13, Peter Maydell, 2021/09/13