You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2009/09/30 17:49:37 UTC
svn commit: r820310 - in /spamassassin/trunk: lib/Mail/SpamAssassin/
lib/Mail/SpamAssassin/Conf/ lib/Mail/SpamAssassin/Plugin/ spamd/ xt/
Author: mmartinec
Date: Wed Sep 30 15:49:36 2009
New Revision: 820310
URL: http://svn.apache.org/viewvc?rev=820310&view=rev
Log:
Deal with ControlStructures::ProhibitMutatingListFunctions
and remove this exception from xt/60_perlcritic.t
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
spamassassin/trunk/spamd/spamd.raw
spamassassin/trunk/xt/60_perlcritic.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm Wed Sep 30 15:49:36 2009
@@ -696,7 +696,7 @@
or die "Can't open '$folder/$sub' dir: $!\n";
# Don't learn from messages marked as deleted
# Or files starting with a leading dot
- push @files, map { $_ = "$sub/$_"; } grep { !/^\.|:2,.*T/ } readdir(DIR);
+ push @files, map { "$sub/$_" } grep { !/^\.|:2,.*T/ } readdir(DIR);
closedir(DIR) or die "error closing directory $folder: $!";
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Sep 30 15:49:36 2009
@@ -748,11 +748,11 @@
/\\\\/, # split at double backslashes,
$hline."\n" # newline needed to make trailing backslashes work
);
- map {
+ foreach (@line) {
s/\\t/\t/g; # expand tabs
s/\\n/\n/g; # expand newlines
s/\\.//g; # purge all other escapes
- } @line;
+ };
$hline = join("\\", @line);
chop($hline); # remove dummy newline again
if (($type eq "ham") || ($type eq "all")) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Wed Sep 30 15:49:36 2009
@@ -982,10 +982,9 @@
my $argstr = $function;
$argstr =~ s/\s+//gs;
- if (scalar @args > 0) {
- $argstr .= ',' . join (', ', map {
- s/\#/[HASH]/gs; "q#".$_."#"
- } @args);
+ if (@args > 0) {
+ $argstr .= ',' . join(', ',
+ map { my $s = $_; $s =~ s/\#/[HASH]/gs; 'q#' . $s . '#' } @args);
}
return ($argstr, \@args);
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm Wed Sep 30 15:49:36 2009
@@ -962,7 +962,7 @@
my $length = length($color) / 3;
my @colors = ($color =~ /(.{$length})(.{$length})(.{$length})/);
# truncate each color to a DWORD, take MSB, left pad nibbles
- @colors = map { s/.*(.{8})$/$1/; s/(..).*/$1/; s/^(.)$/0$1/; $_; } @colors;
+ foreach (@colors) { s/.*(.{8})$/$1/; s/(..).*/$1/; s/^(.)$/0$1/ };
# the color
$color = join("", @colors);
# replace non-hex characters with 0
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Wed Sep 30 15:49:36 2009
@@ -222,8 +222,7 @@
if (!$triplets_loaded) {
# take a copy to avoid modifying the real one
my @default_triplets_path = @Mail::SpamAssassin::default_rules_path;
- @default_triplets_path = map { s,$,/triplets.txt,; $_; }
- @default_triplets_path;
+ s{$}{/triplets.txt} for @default_triplets_path;
my $filename = $self->{main}->first_existing_path (@default_triplets_path);
if (!defined $filename) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Wed Sep 30 15:49:36 2009
@@ -297,7 +297,7 @@
# this exact string is needed below
die("no response\n"); # yes, this is possible
}
- map { chomp } @response;
+ chomp for @response;
dbg("pyzor: got response: " . join("\\n", @response));
if ($response[0] =~ /^Traceback/) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm Wed Sep 30 15:49:36 2009
@@ -121,19 +121,19 @@
if ($pre_name) {
my $pre = $conf->{replace_pre}->{$pre_name};
if ($pre) {
- @re = map { s|($start.+?$end)|$pre$1|; $_; } @re;
+ s{($start.+?$end)}{$pre$1} for @re;
}
}
if ($post_name) {
my $post = $conf->{replace_post}->{$post_name};
if ($post) {
- @re = map { s|($start.+?$end)|$1$post|g; $_; } @re;
+ s{($start.+?$end)}{$1$post}g for @re;
}
}
if ($inter_name) {
my $inter = $conf->{replace_inter}->{$inter_name};
if ($inter) {
- @re = map { s|^$|$inter|; $_; } @re;
+ s{^$}{$inter} for @re;
}
}
for (my $i = 0; $i < @re; $i++) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Wed Sep 30 15:49:36 2009
@@ -278,7 +278,7 @@
return $1;
}
elsif (ref eq 'ARRAY') {
- @{$_} = map { $_ = untaint_var($_) } @{$_};
+ $_ = untaint_var($_) for @{$_};
return @{$_} if wantarray;
}
elsif (ref eq 'HASH') {
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Wed Sep 30 15:49:36 2009
@@ -1430,7 +1430,7 @@
# TODO: split during inflate, too
# note that this preserves line endings
- @{$msglinesref} = map { s/$/\n/gs; $_; } split(/\n/, $out);
+ @{$msglinesref} = map { my $s=$_; $s=~s/$/\n/gs; $s } split(/\n/, $out);
return $actual_length;
}
Modified: spamassassin/trunk/xt/60_perlcritic.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/xt/60_perlcritic.t?rev=820310&r1=820309&r2=820310&view=diff
==============================================================================
--- spamassassin/trunk/xt/60_perlcritic.t (original)
+++ spamassassin/trunk/xt/60_perlcritic.t Wed Sep 30 15:49:36 2009
@@ -29,7 +29,7 @@
severity = 5
verbose = 10
- exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen TestingAndDebugging::RequireUseStrict Subroutines::ProhibitExplicitReturnUndef Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes ControlStructures::ProhibitMutatingListFunctions BuiltinFunctions::ProhibitStringyEval TestingAndDebugging::ProhibitNoStrict BuiltinFunctions::RequireGlobFunction InputOutput::ProhibitInteractiveTest
+ exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen TestingAndDebugging::RequireUseStrict Subroutines::ProhibitExplicitReturnUndef Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval TestingAndDebugging::ProhibitNoStrict BuiltinFunctions::RequireGlobFunction InputOutput::ProhibitInteractiveTest
};
close RC;