From: "Štěpán Němec" <snemec@redhat.com>
To: Phil Sutter <phil@nwl.cc>
Cc: netfilter-devel@vger.kernel.org, Pablo Neira Ayuso <pablo@netfilter.org>
Subject: Re: [PATCH iptables] iptables-test.py: print with color escapes only when stdout isatty
Date: Mon, 06 Sep 2021 11:04:38 +0200 [thread overview]
Message-ID: <20210906110438+0200.839986-snemec@redhat.com> (raw)
In-Reply-To: <20210903153420.GM7616@orbyte.nwl.cc>
On Fri, 03 Sep 2021 17:34:20 +0200
Phil Sutter wrote:
> On Fri, Sep 03, 2021 at 04:44:41PM +0200, Štěpán Němec wrote:
>> On Fri, 03 Sep 2021 14:52:50 +0200
>> Phil Sutter wrote:
>>
>> > With one minor nit:
>> >
>> >> diff --git a/iptables-test.py b/iptables-test.py
>> >> index 90e07feed365..e8fc0c75a43e 100755
>> >> --- a/iptables-test.py
>> >> +++ b/iptables-test.py
>> >> @@ -32,22 +32,25 @@ EXTENSIONS_PATH = "extensions"
>> >> LOGFILE="/tmp/iptables-test.log"
>> >> log_file = None
>> >>
>> >> +STDOUT_IS_TTY = sys.stdout.isatty()
>> >>
>> >> -class Colors:
>> >> - HEADER = '\033[95m'
>> >> - BLUE = '\033[94m'
>> >> - GREEN = '\033[92m'
>> >> - YELLOW = '\033[93m'
>> >> - RED = '\033[91m'
>> >> - ENDC = '\033[0m'
>> >> +def maybe_colored(color, text):
>> >> + terminal_sequences = {
>> >> + 'green': '\033[92m',
>> >> + 'red': '\033[91m',
>> >> + }
>> >> +
>> >> + return (
>> >> + terminal_sequences[color] + text + '\033[0m' if STDOUT_IS_TTY else text
>> >> + )
>> >
>> > I would "simplify" this into:
>> >
>> > | if not sys.stdout.isatty():
>> > | return text
>> > | return terminal_sequences[color] + text + '\033[0m'
>>
>> ...which could be further simplified by dropping 'not' and swapping the
>> two branches.
>
> My change was mostly about reducing the long line, i.e. cosmetics. ;)
Ah, I see. I agree it's not the prettiest thing, but it's still in 80
columns (something that can't be said about a few other lines in the
script).
> One other thing I just noticed, you're dropping the other colors'
> definitions. Maybe worth keeping them?
Is it? I couldn't find anything but red and green ever being used since
2012 when the file was added.
> Also I'm not too happy about the Python exception if an unknown color
> name is passed to maybe_colored(). OTOH though it's just a test script
> and such bug is easily identified.
Yes, it's a helper function in a test script, not some kind of public
API. I don't see how maybe_colored('magenta', ...) is different in that
respect or more likely than print(Colors.MAGENTA + ...) previously.
--
Štěpán
next prev parent reply other threads:[~2021-09-06 9:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-02 11:33 [PATCH iptables] iptables-test.py: print with color escapes only when stdout isatty Štěpán Němec
2021-09-03 12:52 ` Phil Sutter
2021-09-03 14:44 ` Štěpán Němec
2021-09-03 15:34 ` Phil Sutter
2021-09-06 9:04 ` Štěpán Němec [this message]
2021-09-13 15:05 ` Phil Sutter
2021-09-14 9:03 ` Štěpán Němec
2021-09-14 11:25 ` Phil Sutter
2021-09-14 11:49 ` Štěpán Němec
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=20210906110438+0200.839986-snemec@redhat.com \
--to=snemec@redhat.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=phil@nwl.cc \
/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).