WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

move away from most uses of the function form of UNIVERSAL::isa #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karenetheridge wants to merge 2 commits into
base: master
Choose a base branch
from
Open

move away from most uses of the function form of UNIVERSAL::isa #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dd13de
also add a suggested prereq for CPANPLUS - used in AutoInstall - to h…
karenetheridge Apr 24, 2015
fcc8ecc
move away from most uses of the function form of UNIVERSAL::isa
karenetheridge Apr 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ recommends 'JSON' => '2.9';
recommends 'LWP::Simple' => '6.00';
recommends 'LWP::UserAgent' => '6.05';
recommends 'PAR::Dist' => '0.29';

suggests 'CPANPLUS' => '0'; # used by AutoInstall, when installed

# Remove some extra test files
clean_files( qw{ t/Foo } );
Expand Down
12 changes: 6 additions & 6 deletions lib/Module/AutoInstall.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ sub do_install {
__PACKAGE__->install(
[
$Config
? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
? ( ref($Config) eq 'HASH' ? %{$Config} : @{$Config} )
: ()
],
@Missing,
Expand Down Expand Up @@ -162,7 +162,7 @@ sub import {

print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n";

$modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' );
$modules = [ %{$modules} ] if ref($modules) eq 'HASH';

unshift @$modules, -default => &{ shift(@$modules) }
if ( ref( $modules->[0] ) eq 'CODE' ); # XXX: bugward compatibility
Expand Down Expand Up @@ -423,7 +423,7 @@ sub _install_cpanplus {

# if we're root, set UNINST=1 to avoid trouble unless user asked for it.
my $makeflags = $conf->get_conf('makeflags') || '';
if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) {
if ( ref($makeflags) eq 'HASH' ) ) {
# 0.03+ uses a hashref here
$makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST};

Expand Down Expand Up @@ -690,7 +690,7 @@ sub _can_write {
.
my $missing = join( ',', @Missing );
my $config = join( ',',
UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
ref($Config) eq 'HASH' ? %{$Config} : @{$Config} )
if $Config;

return
Expand Down Expand Up @@ -818,7 +818,7 @@ sub _make_args {

my $missing = join( ',', @Missing );
my $config =
join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
join( ',', (ref($Config) eq 'HASH' ? %{$Config} : @{$Config} ))
if $Config;

$PostambleActions = (
Expand All @@ -833,7 +833,7 @@ sub _make_args {
"\$(PERL) $0 --config=$config --upgradedeps=$deps_list";

my $config_notest =
join( ',', (UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config}),
join( ',', (ref($Config) eq 'HASH' ? %{$Config} : @{$Config} ))
'notest', 1 )
if $Config;

Expand Down