svn commit: r1903061 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Plugin/ExtractText.pm t/perlcritic.pl

[mm...@apache.org]

Author: mmartinec
Date: Wed Jul 27 16:04:02 2022
New Revision: 1903061

URL: http://svn.apache.org/viewvc?rev=1903061&view=rev
Log:
t/perlcritic.pl: remove exemption for Perlsecret "Baby Cart", deal with the only case of its use in ExtractText.pm (the @{[]} hack is no longer needed around split() in scalar context since perl5.11, we require 5.14 in SpamAssassin.pm)

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ExtractText.pm
    spamassassin/trunk/t/perlcritic.pl

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ExtractText.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ExtractText.pm?rev=1903061&r1=1903060&r2=1903061&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ExtractText.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ExtractText.pm Wed Jul 27 16:04:02 2022
@@ -592,7 +592,11 @@ sub _extract {
       push @{$coll->{text}}, $text;
     }
     $coll->{chars} += length($text);
-    $coll->{words} += scalar @{[split(/\W+/s,$text)]} - 1;
+
+    # the following is safe (regarding clobbering the @_) since perl v5.11.0
+    $coll->{words} += split(/\W+/s,$text) - 1;
+    # $coll->{words} += scalar @{[split(/\W+/s,$text)]} - 1;  # old perl hack
+
     dbg("extracttext: rendering text for type $type with $tool->{name}");
     $part->set_rendered($text);
   }

Modified: spamassassin/trunk/t/perlcritic.pl
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/perlcritic.pl?rev=1903061&r1=1903060&r2=1903061&view=diff
==============================================================================
--- spamassassin/trunk/t/perlcritic.pl (original)
+++ spamassassin/trunk/t/perlcritic.pl Wed Jul 27 16:04:02 2022
@@ -24,7 +24,7 @@ print RC q{
   allow = refs
 
   [Perlsecret]
-  allow_secrets = Venus, Baby Cart
+  allow_secrets = Venus
 
 }  or die "cannot write t/log/perlcritic.rc";
 close RC  or die "cannot close t/log/perlcritic.rc";