require 5.006; use 'our' instead of 'vars' for Test::More > 0.80

Perl-Toolchain-Gang · Sep 9, 2008 · b736661 · b736661
1 parent 48a9b2c
commit b736661
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 15 deletions.
diff --git a/Build.PL b/Build.PL
@@ -1,3 +1,4 @@
+use 5.006;
 use strict;
 use lib 'inc';
 eval "require Pod::WikiDoc";
@@ -11,6 +12,7 @@ $class->new(
     create_readme       => 1,
     create_makefile_pl  => 'traditional',
     requires        => {
+        'perl' => 5.006,
         'Exporter' => 0,
     },
     build_requires => {

diff --git a/Changes b/Changes
@@ -1,5 +1,10 @@
 Changes for Sub::Uplevel
 
+0.20 Tue Sep  9 19:23:35 EDT 2008
+
+    - changed: bumped perl requirement to 5.006 and stopped using vars
+      (fixes a test bug under Test::More > 0.80)
+
 0.19_03 Fri Jul  4 13:31:21 EDT 2008
 
     - fixed: load Carp only as needed (fixes problem on 5.005)

diff --git a/META.yml b/META.yml
@@ -1,6 +1,6 @@
 ---
 name: Sub-Uplevel
-version: 0.19_03
+version: 0.20
 author:
   - 'David A. Golden <dagolden@cpan.org>'
 abstract: apparently run a function in a higher stack frame
@@ -9,6 +9,7 @@ resources:
   license: http://dev.perl.org/licenses/
 requires:
   Exporter: 0
+  perl: 5.006
 build_requires:
   Carp: 0
   Test::More: 0.47
@@ -17,7 +18,7 @@ provides:
     file: lib/Sub/Uplevel.pm
   Sub::Uplevel:
     file: lib/Sub/Uplevel.pm
-    version: 0.19_03
+    version: 0.20
 generated_by: Module::Build version 0.280801
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.2.html

diff --git a/Makefile.PL b/Makefile.PL
@@ -1,16 +1,17 @@
 # Note: this file was auto-generated by Module::Build::Compat version 0.2808_01
+require 5.006;
 use ExtUtils::MakeMaker;
 WriteMakefile
 (
+          'PL_FILES' => {},
+          'INSTALLDIRS' => 'site',
           'NAME' => 'Sub::Uplevel',
+          'EXE_FILES' => [],
           'VERSION_FROM' => 'lib/Sub/Uplevel.pm',
           'PREREQ_PM' => {
-                           'Carp' => 0,
+                           'Test::More' => '0.47',
                            'Exporter' => 0,
-                           'Test::More' => '0.47'
-                         },
-          'INSTALLDIRS' => 'site',
-          'EXE_FILES' => [],
-          'PL_FILES' => {}
+                           'Carp' => 0
+                         }
         )
 ;
diff --git a/README b/README
@@ -2,7 +2,7 @@ NAME
     Sub::Uplevel - apparently run a function in a higher stack frame
 
 VERSION
-    This documentation describes version 0.19_03
+    This documentation describes version 0.20
 
 SYNOPSIS
       use Sub::Uplevel;

diff --git a/lib/Sub/Uplevel.pm b/lib/Sub/Uplevel.pm
@@ -1,8 +1,8 @@
 package Sub::Uplevel;
 
+use 5.006;
 use strict;
-use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '0.19_03';
+our $VERSION = '0.20';
 $VERSION = eval $VERSION;
 
 
@@ -14,8 +14,8 @@ if ( not defined *CORE::GLOBAL::caller{CODE} ) {
 }
 
 require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(uplevel);
+@Sub::Uplevel::ISA = qw(Exporter);
+@Sub::Uplevel::EXPORT = qw(uplevel);
 
 =head1 NAME
 
@@ -86,9 +86,9 @@ stack depth.
 
 =cut
 
-use vars qw/@Up_Frames $Caller_Proxy/;
 # @Up_Frames -- uplevel stack
 # $Caller_Proxy -- whatever caller() override was in effect before uplevel
+our (@Up_Frames, $Caller_Proxy);
 
 sub _apparent_stack_height {
     my $height = 1; # start above this function 

diff --git a/lib/Sub/Uplevel.pod b/lib/Sub/Uplevel.pod
@@ -8,7 +8,7 @@ Sub::Uplevel - apparently run a function in a higher stack frame
 
 =head1 VERSION
 
-This documentation describes version 0.19_03
+This documentation describes version 0.20
 
 
 =head1 SYNOPSIS