From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: marcandre.lureau@redhat.com, jsnow@redhat.com, michael.roth@amd.com
Subject: [PATCH 3/5] qapi: Bury some unused code in class Indentation
Date: Wed, 8 Sep 2021 06:54:26 +0200 [thread overview]
Message-ID: <20210908045428.2689093-4-armbru@redhat.com> (raw)
In-Reply-To: <20210908045428.2689093-1-armbru@redhat.com>
.__int__() has never been used. Drop it.
.decrease() raises ArithmeticError when asked to decrease indentation
level below zero. Nothing catches it. It's a programming error.
Dumb down to assert.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/common.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 1d62c27fb7..489273574a 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -132,9 +132,6 @@ class Indentation:
def __init__(self, initial: int = 0) -> None:
self._level = initial
- def __int__(self) -> int:
- return self._level
-
def __repr__(self) -> str:
return "{}({:d})".format(type(self).__name__, self._level)
@@ -148,9 +145,7 @@ def increase(self, amount: int = 4) -> None:
def decrease(self, amount: int = 4) -> None:
"""Decrease the indentation level by ``amount``, default 4."""
- if self._level < amount:
- raise ArithmeticError(
- f"Can't remove {amount:d} spaces from {self!r}")
+ assert amount <= self._level
self._level -= amount
--
2.31.1
next prev parent reply other threads:[~2021-09-08 4:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 4:54 [PATCH 0/5] qapi: Another round of minor fixes and cleanups Markus Armbruster
2021-09-08 4:54 ` [PATCH 1/5] qapi: Fix a botched type annotation Markus Armbruster
2021-09-08 4:54 ` [PATCH 2/5] qapi: Drop Indentation.__bool__() Markus Armbruster
2021-09-13 18:29 ` Eric Blake
2021-09-08 4:54 ` Markus Armbruster [this message]
2021-09-08 4:54 ` [PATCH 4/5] tests/qapi-schema: Cover 'not' condition with empty argument Markus Armbruster
2021-09-08 4:54 ` [PATCH 5/5] qapi: Fix bogus error for 'if': { 'not': '' } Markus Armbruster
2021-09-08 13:27 ` Markus Armbruster
2021-09-08 6:48 ` [PATCH 0/5] qapi: Another round of minor fixes and cleanups Marc-André Lureau
2021-09-13 7:57 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210908045428.2689093-4-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).