Change 30175 by [EMAIL PROTECTED] on 2007/02/08 16:33:12
Integrate:
parts of:
[ 23768]
Subject: Re: [PATCH] Remove Carp from warnings.pm
From: Jim Cromie <[EMAIL PROTECTED]>
Date: Mon, 3 Jan 2005 06:36:16 -0700
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/ext/B/t/stash.t#10 integrate
... //depot/maint-5.8/perl/lib/Carp.pm#8 integrate
... //depot/maint-5.8/perl/lib/English.pm#6 integrate
... //depot/maint-5.8/perl/lib/Exporter.pm#5 integrate
... //depot/maint-5.8/perl/lib/Exporter.t#4 integrate
... //depot/maint-5.8/perl/lib/Exporter/Heavy.pm#5 integrate
Differences ...
==== //depot/maint-5.8/perl/lib/Carp.pm#8 (text) ====
Index: perl/lib/Carp.pm
--- perl/lib/Carp.pm#7~24485~ 2005-05-16 08:35:24.000000000 -0700
+++ perl/lib/Carp.pm 2007-02-08 08:33:12.000000000 -0800
@@ -178,9 +178,11 @@
=cut
-
+# disable these by default, so they can live w/o require Carp
$CarpInternal{Carp}++;
$CarpInternal{warnings}++;
+$Internal{Exporter}++;
+$Internal{'Exporter::Heavy'}++;
$CarpLevel = 0; # How many extra package levels to skip on carp.
# How many calls to skip on confess.
# Reconciling these notions is hard, use
==== //depot/maint-5.8/perl/lib/English.pm#6 (text) ====
Index: perl/lib/English.pm
--- perl/lib/English.pm#5~26806~ 2006-01-12 11:23:34.000000000 -0800
+++ perl/lib/English.pm 2007-02-08 08:33:12.000000000 -0800
@@ -1,6 +1,6 @@
package English;
-our $VERSION = '1.02';
+our $VERSION = '1.03';
require Exporter;
@ISA = (Exporter);
@@ -64,7 +64,7 @@
}
|| do {
require Carp ;
- Carp::croak "Can't create English for match leftovers: $@" ;
+ Carp::croak("Can't create English for match leftovers: $@") ;
}
) ;
}
==== //depot/maint-5.8/perl/lib/Exporter.pm#5 (text) ====
Index: perl/lib/Exporter.pm
--- perl/lib/Exporter.pm#4~22230~ 2004-01-27 12:08:23.000000000 -0800
+++ perl/lib/Exporter.pm 2007-02-08 08:33:12.000000000 -0800
@@ -9,9 +9,10 @@
our $Debug = 0;
our $ExportLevel = 0;
our $Verbose ||= 0;
-our $VERSION = '5.58';
+our $VERSION = '5.59';
our (%Cache);
-$Carp::Internal{Exporter} = 1;
+# Carp does this now for us, so we can finally live w/o Carp
+#$Carp::Internal{Exporter} = 1;
sub as_heavy {
require Exporter::Heavy;
==== //depot/maint-5.8/perl/lib/Exporter.t#4 (text) ====
Index: perl/lib/Exporter.t
--- perl/lib/Exporter.t#3~22024~ 2003-12-31 07:05:22.000000000 -0800
+++ perl/lib/Exporter.t 2007-02-08 08:33:12.000000000 -0800
@@ -75,7 +75,7 @@
BEGIN {*is = \&Is};
sub Is { 'Is' };
-Exporter::export_ok_tags;
+Exporter::export_ok_tags();
my %tags = map { $_ => 1 } map { @$_ } values %EXPORT_TAGS;
my %exportok = map { $_ => 1 } @EXPORT_OK;
==== //depot/maint-5.8/perl/lib/Exporter/Heavy.pm#5 (text) ====
Index: perl/lib/Exporter/Heavy.pm
--- perl/lib/Exporter/Heavy.pm#4~22230~ 2004-01-27 12:08:23.000000000 -0800
+++ perl/lib/Exporter/Heavy.pm 2007-02-08 08:33:12.000000000 -0800
@@ -5,7 +5,8 @@
# On one line so MakeMaker will see it.
require Exporter; our $VERSION = $Exporter::VERSION;
-$Carp::Internal{"Exporter::Heavy"} = 1;
+# Carp does this now for us, so we can finally live w/o Carp
+#$Carp::Internal{"Exporter::Heavy"} = 1;
=head1 NAME
End of Patch.
