From 535c8c23bc7871e6cd58c97b3796e8e56a4824d8 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 13 Jul 2017 04:38:54 +0200 Subject: [PATCH 1/3] Import Exporter's import instead of setting @ISA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is one of the modern forms to get at the import. Use it instead of inheriting from Exporter and using the deprecated «use vars». --- Digest/file.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Digest/file.pm b/Digest/file.pm index 3b86e63..e0e1423 100644 --- a/Digest/file.pm +++ b/Digest/file.pm @@ -2,14 +2,13 @@ package Digest::file; use strict; -use Exporter (); +use Exporter qw(import); use Carp qw(croak); use Digest (); -use vars qw($VERSION @ISA @EXPORT_OK); +use vars qw($VERSION @EXPORT_OK); $VERSION = "1.16"; -@ISA = qw(Exporter); @EXPORT_OK = qw(digest_file_ctx digest_file digest_file_hex digest_file_base64); sub digest_file_ctx { From c98df7111dc6430308699ddbddd9c2836e50b8bd Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 13 Jul 2017 04:41:57 +0200 Subject: [PATCH 2/3] Use parent instead of setting inheriting via @ISA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the modern form of inheriting from another module. Use it instead of inheriting via @ISA and using the deprecated «use vars». --- t/base.t | 4 +--- t/file.t | 5 ++--- t/lib/Digest/Dummy.pm | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/t/base.t b/t/base.t index 9fc861e..d19b42c 100644 --- a/t/base.t +++ b/t/base.t @@ -4,9 +4,7 @@ use Test::More tests => 13; { package LenDigest; - require Digest::base; - use vars qw(@ISA); - @ISA = qw(Digest::base); + use parent qw(Digest::base); sub new { my $class = shift; diff --git a/t/file.t b/t/file.t index 79f32de..56391f3 100644 --- a/t/file.t +++ b/t/file.t @@ -4,9 +4,8 @@ use Test::More tests => 5; { package Digest::Foo; - require Digest::base; - use vars qw(@ISA $VERSION); - @ISA = qw(Digest::base); + use vars qw($VERSION); + use parent qw(Digest::base); sub new { my $class = shift; diff --git a/t/lib/Digest/Dummy.pm b/t/lib/Digest/Dummy.pm index b3db0db..4dc54a3 100644 --- a/t/lib/Digest/Dummy.pm +++ b/t/lib/Digest/Dummy.pm @@ -1,12 +1,10 @@ package Digest::Dummy; use strict; -use vars qw($VERSION @ISA); +use vars qw($VERSION); +use parent qw(Digest::base); $VERSION = 1; -require Digest::base; -@ISA = qw(Digest::base); - sub new { my $class = shift; my $d = shift || "ooo"; From ed1a733a83aa4cbcf798a847eff762edcec5ffd5 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 13 Jul 2017 04:43:36 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Switch=20from=20=C2=ABuse=20vars=C2=BB=20to?= =?UTF-8?q?=20=C2=ABour=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The former is deprecated and has a non-insignificant cost of loading a module. --- Digest.pm | 6 +++--- Digest/base.pm | 4 ++-- Digest/file.pm | 6 ++---- t/file.t | 3 ++- t/lib/Digest/Dummy.pm | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Digest.pm b/Digest.pm index 2ae6eec..b7389ea 100644 --- a/Digest.pm +++ b/Digest.pm @@ -1,11 +1,11 @@ package Digest; use strict; -use vars qw($VERSION %MMAP $AUTOLOAD); -$VERSION = "1.17"; +our $VERSION = "1.17"; +our $AUTOLOAD; -%MMAP = ( +our %MMAP = ( "SHA-1" => [["Digest::SHA", 1], "Digest::SHA1", ["Digest::SHA2", 1]], "SHA-224" => [["Digest::SHA", 224]], "SHA-256" => [["Digest::SHA", 256], ["Digest::SHA2", 256]], diff --git a/Digest/base.pm b/Digest/base.pm index 2535901..c009975 100644 --- a/Digest/base.pm +++ b/Digest/base.pm @@ -1,8 +1,8 @@ package Digest::base; use strict; -use vars qw($VERSION); -$VERSION = "1.16"; + +our $VERSION = "1.16"; # subclass is supposed to implement at least these sub new; diff --git a/Digest/file.pm b/Digest/file.pm index e0e1423..d8e13cd 100644 --- a/Digest/file.pm +++ b/Digest/file.pm @@ -6,10 +6,8 @@ use Exporter qw(import); use Carp qw(croak); use Digest (); -use vars qw($VERSION @EXPORT_OK); - -$VERSION = "1.16"; -@EXPORT_OK = qw(digest_file_ctx digest_file digest_file_hex digest_file_base64); +our $VERSION = "1.16"; +our @EXPORT_OK = qw(digest_file_ctx digest_file digest_file_hex digest_file_base64); sub digest_file_ctx { my $file = shift; diff --git a/t/file.t b/t/file.t index 56391f3..a3200fc 100644 --- a/t/file.t +++ b/t/file.t @@ -4,9 +4,10 @@ use Test::More tests => 5; { package Digest::Foo; - use vars qw($VERSION); use parent qw(Digest::base); + our $VERSION; + sub new { my $class = shift; my $str = ""; diff --git a/t/lib/Digest/Dummy.pm b/t/lib/Digest/Dummy.pm index 4dc54a3..dd5f0f1 100644 --- a/t/lib/Digest/Dummy.pm +++ b/t/lib/Digest/Dummy.pm @@ -1,9 +1,9 @@ package Digest::Dummy; use strict; -use vars qw($VERSION); use parent qw(Digest::base); -$VERSION = 1; + +our $VERSION = 1; sub new { my $class = shift;