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 2020/08/13 13:19:21 UTC
svn commit: r1880828 - in /spamassassin/trunk: build/ build/old/
lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/BayesStore/ masses/
masses/corpora/ spamd-apache2/lib/Mail/SpamAssassin/Spamd/ t.rules/ t/ tools/
Author: mmartinec
Date: Thu Aug 13 13:19:21 2020
New Revision: 1880828
URL: http://svn.apache.org/viewvc?rev=1880828&view=rev
Log:
Bug 7842: Perl 'indirect object notation' is deprecated, changing to the recommended syntax - more cases (in supporting code)
Modified:
spamassassin/trunk/build/old/sha1sum.pl
spamassassin/trunk/build/sha256sum.pl
spamassassin/trunk/build/sha512sum.pl
spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/masses/corpora/mass-find-nonspam
spamassassin/trunk/masses/mass-check
spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
spamassassin/trunk/t.rules/run
spamassassin/trunk/t/rule_names.t
spamassassin/trunk/t/trust_path.t
spamassassin/trunk/tools/split_corpora
Modified: spamassassin/trunk/build/old/sha1sum.pl
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/old/sha1sum.pl?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/build/old/sha1sum.pl (original)
+++ spamassassin/trunk/build/old/sha1sum.pl Thu Aug 13 13:19:21 2020
@@ -1,8 +1,8 @@
#!/usr/bin/perl
BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
+ eval { require Digest::SHA; Digest::SHA->import(qw(sha1_hex)); 1 }
+ or do { require Digest::SHA1; Digest::SHA1->import(qw(sha1_hex)) }
}
$/=undef;
Modified: spamassassin/trunk/build/sha256sum.pl
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/sha256sum.pl?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/build/sha256sum.pl (original)
+++ spamassassin/trunk/build/sha256sum.pl Thu Aug 13 13:19:21 2020
@@ -1,7 +1,7 @@
#!/usr/bin/perl
BEGIN {
- require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex);
+ require Digest::SHA; Digest::SHA->import(qw(sha256_hex sha512_hex));
}
$/=undef;
Modified: spamassassin/trunk/build/sha512sum.pl
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/sha512sum.pl?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/build/sha512sum.pl (original)
+++ spamassassin/trunk/build/sha512sum.pl Thu Aug 13 13:19:21 2020
@@ -1,7 +1,7 @@
#!/usr/bin/perl
BEGIN {
- require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex);
+ require Digest::SHA; Digest::SHA->import(qw(sha256_hex sha512_hex));
}
$/=undef;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm Thu Aug 13 13:19:21 2020
@@ -43,7 +43,7 @@ Mail::SpamAssassin::ArchiveIterator - fi
=head1 SYNOPSIS
- my $iter = new Mail::SpamAssassin::ArchiveIterator(
+ my $iter = Mail::SpamAssassin::ArchiveIterator->new(
{
'opt_max_size' => 256 * 1024, # 0 implies no limit
'opt_cache' => 1,
@@ -77,7 +77,7 @@ and C<result_sub> functions appropriatel
###########################################################################
-=item $item = new Mail::SpamAssassin::ArchiveIterator( [ { opt => val, ... } ] )
+=item $item = Mail::SpamAssassin::ArchiveIterator->new( [ { opt => val, ... } ] )
Constructs a new C<Mail::SpamAssassin::ArchiveIterator> object. You may
pass the following attribute-value pairs to the constructor. The pairs are
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm Thu Aug 13 13:19:21 2020
@@ -51,7 +51,7 @@ use constant HAS_DBI => eval { require D
# We need this so we can import the pg_types, since this is a DBD::Pg specific module it should be ok
# YUCK! This little require/import trick is required for the rpm stuff
-BEGIN { require DBD::Pg; import DBD::Pg qw(:pg_types); }
+BEGIN { require DBD::Pg; DBD::Pg->import(qw(:pg_types)); }
=head1 METHODS
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm Thu Aug 13 13:19:21 2020
@@ -21,7 +21,7 @@ Mail::SpamAssassin::PerMsgLearner - per-
=head1 SYNOPSIS
- my $spamtest = new Mail::SpamAssassin ({
+ my $spamtest = Mail::SpamAssassin->new({
'rules_filename' => '/etc/spamassassin.rules',
'userprefs_filename' => $ENV{HOME}.'/.spamassassin/user_prefs'
});
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Thu Aug 13 13:19:21 2020
@@ -21,7 +21,7 @@ Mail::SpamAssassin::PerMsgStatus - per-m
=head1 SYNOPSIS
- my $spamtest = new Mail::SpamAssassin ({
+ my $spamtest = Mail::SpamAssassin->new({
'rules_filename' => '/etc/spamassassin.rules',
'userprefs_filename' => $ENV{HOME}.'/.spamassassin/user_prefs'
});
Modified: spamassassin/trunk/masses/corpora/mass-find-nonspam
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/corpora/mass-find-nonspam?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/masses/corpora/mass-find-nonspam (original)
+++ spamassassin/trunk/masses/corpora/mass-find-nonspam Thu Aug 13 13:19:21 2020
@@ -113,7 +113,7 @@ our $opt_single;
use Getopt::Long;
GetOptions("single");
-my $iter = new Mail::SpamAssassin::ArchiveIterator ({
+my $iter = Mail::SpamAssassin::ArchiveIterator->new({
'opt_j' => 1,
'opt_n' => 1,
'opt_all' => 1,
Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Thu Aug 13 13:19:21 2020
@@ -315,7 +315,7 @@ if ($opt_reuse) {
my $user_prefs = "$opt_p/user_prefs";
sub create_spamtest {
- return new Mail::SpamAssassin ({
+ return Mail::SpamAssassin->new({
'debug' => $opt_debug,
'rules_filename' => $opt_c,
'site_rules_filename' => "$opt_p/local.cf",
@@ -407,7 +407,7 @@ else {
###########################################################################
## SCAN MODE
-my $iter = new Mail::SpamAssassin::ArchiveIterator($AIopts);
+my $iter = Mail::SpamAssassin::ArchiveIterator->new($AIopts);
# setup the AI functions
if ($opt_client) {
Modified: spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm (original)
+++ spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm Thu Aug 13 13:19:21 2020
@@ -255,7 +255,7 @@ sub _validate {
if (exists $self->{'ident-timeout'} && $self->{'ident-timeout'} <= 0) {
die "ERROR: --ident-timeout must be > 0\n";
}
- ##import Net::Ident qw(ident_lookup);
+ ##Net::Ident->import(qw(ident_lookup));
}
# let's not modify %ENV here...
Modified: spamassassin/trunk/t.rules/run
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t.rules/run?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/t.rules/run (original)
+++ spamassassin/trunk/t.rules/run Thu Aug 13 13:19:21 2020
@@ -147,7 +147,7 @@ sub mypass {
sub create_spamtest {
$spamtest->finish() if $spamtest;
- $spamtest = new Mail::SpamAssassin(
+ $spamtest = Mail::SpamAssassin->new(
{
rules_filename => 'rules',
site_rules_filename => 'rules/local.cf',
Modified: spamassassin/trunk/t/rule_names.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/rule_names.t?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/t/rule_names.t (original)
+++ spamassassin/trunk/t/rule_names.t Thu Aug 13 13:19:21 2020
@@ -22,8 +22,8 @@ use strict;
use Mail::SpamAssassin;
BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
+ eval { require Digest::SHA; Digest::SHA->import(qw(sha1)); 1 }
+ or do { require Digest::SHA1; Digest::SHA1->import(qw(sha1)) }
}
our $RUN_THIS_TEST;
Modified: spamassassin/trunk/t/trust_path.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/trust_path.t?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/t/trust_path.t (original)
+++ spamassassin/trunk/t/trust_path.t Thu Aug 13 13:19:21 2020
@@ -15,7 +15,7 @@ our $have_patricia = 0;
eval {
require Net::Patricia;
Net::Patricia->VERSION(1.16); # need AF_INET6 support
- import Net::Patricia;
+ Net::Patricia->import;
$have_patricia = 1;
};
Modified: spamassassin/trunk/tools/split_corpora
URL: http://svn.apache.org/viewvc/spamassassin/trunk/tools/split_corpora?rev=1880828&r1=1880827&r2=1880828&view=diff
==============================================================================
--- spamassassin/trunk/tools/split_corpora (original)
+++ spamassassin/trunk/tools/split_corpora Thu Aug 13 13:19:21 2020
@@ -43,7 +43,7 @@ foreach (@IN_FILES) {
my @bucket_fhs = ();
foreach my $bucket (1 .. $num_buckets) {
- my $bucket_fh = new FileHandle();
+ my $bucket_fh = FileHandle->new();
if (!$bucket_fh->open(">$prefix.$bucket")) {
die "Could not open '$prefix.$bucket' for writing: $!\n";
@@ -54,7 +54,7 @@ foreach my $bucket (1 .. $num_buckets) {
my $current_bucket = 0;
-my $iter = new Mail::SpamAssassin::ArchiveIterator({
+my $iter = Mail::SpamAssassin::ArchiveIterator->new({
'opt_all' => 1,
});