From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id AA1E81F47A for ; Mon, 13 Mar 2023 19:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1678736307; bh=wOQ4wVSjGM9L2fUi/I1TI1Kzb97WFTIL9KPY80bnVls=; h=From:To:Subject:Date:In-Reply-To:References:From; b=yBwVcYXB7pNAHzjOE/TszV5pa7V5ZWdLZyBD08Z5OCipOdcb/EDnhSIk8S19WZB9y FJuzFA5m9LBhCPQNhIKGuJAg2aDHEbiRvo1VJpLI0PXDxE35JhtCZYABap9iYmYBkB cEHGdG+Oo3PUVshVOsBzZcpMDEl1hhTDaXqFKYFU= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/3] spamcheck: use v5.12 and golf Date: Mon, 13 Mar 2023 19:38:26 +0000 Message-Id: <20230313193827.3635690-3-e@80x24.org> In-Reply-To: <20230313193827.3635690-1-e@80x24.org> References: <20230313193827.3635690-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: No problems with `unicode_strings' in these modules. We can also shave our LoC count in a few places. --- lib/PublicInbox/Spamcheck.pm | 12 ++++-------- lib/PublicInbox/Spamcheck/Spamc.pm | 5 ++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/PublicInbox/Spamcheck.pm b/lib/PublicInbox/Spamcheck.pm index d8fa80c8..fbf9355d 100644 --- a/lib/PublicInbox/Spamcheck.pm +++ b/lib/PublicInbox/Spamcheck.pm @@ -1,21 +1,17 @@ -# Copyright (C) 2018-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # Spamchecking used by -watch and -mda tools package PublicInbox::Spamcheck; -use strict; -use warnings; +use v5.12; sub get { my ($cfg, $key, $default) = @_; - my $spamcheck = $cfg->{$key}; - $spamcheck = $default unless $spamcheck; + my $spamcheck = $cfg->{$key} || $default; return if !$spamcheck || $spamcheck eq 'none'; - if ($spamcheck eq 'spamc') { - $spamcheck = 'PublicInbox::Spamcheck::Spamc'; - } + $spamcheck = 'PublicInbox::Spamcheck::Spamc' if $spamcheck eq 'spamc'; if ($spamcheck =~ /::/) { eval "require $spamcheck"; return $spamcheck->new; diff --git a/lib/PublicInbox/Spamcheck/Spamc.pm b/lib/PublicInbox/Spamcheck/Spamc.pm index d2b6429c..2f821532 100644 --- a/lib/PublicInbox/Spamcheck/Spamc.pm +++ b/lib/PublicInbox/Spamcheck/Spamc.pm @@ -1,10 +1,9 @@ -# Copyright (C) 2016-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # Default spam filter class for wrapping spamc(1) package PublicInbox::Spamcheck::Spamc; -use strict; -use warnings; +use v5.12; use PublicInbox::Spawn qw(popen_rd spawn); use IO::Handle; use Fcntl qw(SEEK_SET);