diff options
| author | M.J.T. Guy <mjtg@cus.cam.ac.uk> | 1997-04-10 20:55:05 +1200 |
|---|---|---|
| committer | Tim Bunce <Tim.Bunce@ig.co.uk> | 1997-08-07 00:00:00 +1200 |
| commit | d704f39a0db2dc23790dfd9d7bd59ce9928a6e2c (patch) | |
| tree | 7806b0de54acfde8d52e79012c303d76ce9b9036 | |
| parent | 3bb63ce62db2f3ee2964b123e979675f768f552c (diff) | |
| download | perl-d704f39a0db2dc23790dfd9d7bd59ce9928a6e2c.tar.gz | |
Remove 'use UNIVERSAL;', switch to UNIVERSAL::isa()
Subject: Re: UNIVERSAL.pm and import methods
I wrote
> I've a sneaking feeling that I'm the only person who's tried to use
> this. And as you might guess from my bug reports, I've learnt the
> error of my ways.
I spoke too soon. There are three uses in the standard distribution.
The attached patch should get rid of them.
Probably worth doing this irrespective of how the UNIVERSAL/import
question is resolved.
p5p-msgid: E0whaZJ-0007BA-00@ursa.cus.cam.ac.uk
| -rw-r--r-- | lib/Class/Struct.pm | 3 | ||||
| -rw-r--r-- | lib/File/Compare.pm | 7 | ||||
| -rw-r--r-- | lib/File/Copy.pm | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/lib/Class/Struct.pm b/lib/Class/Struct.pm index eca2c6c5e3..09ab196254 100644 --- a/lib/Class/Struct.pm +++ b/lib/Class/Struct.pm @@ -146,9 +146,6 @@ sub struct { # Create accessor methods. - if ( $got_class && $CHECK_CLASS_MEMBERSHIP ) { - $out .= " use UNIVERSAL;\n"; - } my( $pre, $pst, $sel ); $cnt = 0; foreach $name (@methods){ diff --git a/lib/File/Compare.pm b/lib/File/Compare.pm index a76eb1ff59..2f9c45c4c6 100644 --- a/lib/File/Compare.pm +++ b/lib/File/Compare.pm @@ -5,7 +5,6 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Too_Big *FROM *TO); require Exporter; use Carp; -use UNIVERSAL qw(isa); $VERSION = '1.1001'; @ISA = qw(Exporter); @@ -34,7 +33,8 @@ sub compare { croak("from undefined") unless (defined $from); croak("to undefined") unless (defined $to); - if (ref($from) && (isa($from,'GLOB') || isa($from,'IO::Handle'))) { + if (ref($from) && + (UNIVERSAL::isa($from,'GLOB') || UNIVERSAL::isa($from,'IO::Handle'))) { *FROM = *$from; } elsif (ref(\$from) eq 'GLOB') { *FROM = $from; @@ -45,7 +45,8 @@ sub compare { $fromsize = -s FROM; } - if (ref($to) && (isa($to,'GLOB') || isa($to,'IO::Handle'))) { + if (ref($to) && + (UNIVERSAL::isa($to,'GLOB') || UNIVERSAL::isa($to,'IO::Handle'))) { *TO = *$to; } elsif (ref(\$to) eq 'GLOB') { *TO = $to; diff --git a/lib/File/Copy.pm b/lib/File/Copy.pm index b1baa207b3..e95168e24b 100644 --- a/lib/File/Copy.pm +++ b/lib/File/Copy.pm @@ -9,7 +9,6 @@ package File::Copy; use strict; use Carp; -use UNIVERSAL qw(isa); use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION $Too_Big © &syscopy &cp &mv); @@ -48,11 +47,13 @@ sub copy { my $from_a_handle = (ref($from) ? (ref($from) eq 'GLOB' - || isa($from, 'GLOB') || isa($from, 'IO::Handle')) + || UNIVERSAL::isa($from, 'GLOB') + || UNIVERSAL::isa($from, 'IO::Handle')) : (ref(\$from) eq 'GLOB')); my $to_a_handle = (ref($to) ? (ref($to) eq 'GLOB' - || isa($to, 'GLOB') || isa($to, 'IO::Handle')) + || UNIVERSAL::isa($to, 'GLOB') + || UNIVERSAL::isa($to, 'IO::Handle')) : (ref(\$to) eq 'GLOB')); if (!$from_a_handle && !$to_a_handle && -d $to && ! -d $from) { |