All of lore.kernel.org
 help / color / mirror / Atom feed
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 2/5] qapi: Drop Indentation.__bool__()
Date: Wed,  8 Sep 2021 06:54:25 +0200	[thread overview]
Message-ID: <20210908045428.2689093-3-armbru@redhat.com> (raw)
In-Reply-To: <20210908045428.2689093-1-armbru@redhat.com>

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>
---
 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



  parent reply	other threads:[~2021-09-08  4:58 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 ` Markus Armbruster [this message]
2021-09-13 18:29   ` [PATCH 2/5] qapi: Drop Indentation.__bool__() Eric Blake
2021-09-08  4:54 ` [PATCH 3/5] qapi: Bury some unused code in class Indentation Markus Armbruster
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-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.