Upgrade to Test::Harness 3.13

[p5sagit/p5-mst-13.2.git] / lib / Test / Builder.pm

diff --git a/lib/Test/Builder.pm b/lib/Test/Builder.pm
index 57a57d2..1a2cdb0 100644 (file)
--- a/lib/Test/Builder.pm
+++ b/lib/Test/Builder.pm
@@ -1,15 +1,10 @@
 package Test::Builder;
 
-use 5.004;
-
-# $^C was only introduced in 5.005-ish.  We do this to prevent
-# use of uninitialized value warnings in older perls.
-$^C ||= 0;
-
+use 5.006;
 use strict;
-use vars qw($VERSION);
-$VERSION = '0.74_1';
-$VERSION = eval $VERSION;    # make the alpha version come out as a number
+
+our $VERSION = '0.80';
+$VERSION = eval { $VERSION }; # make the alpha version come out as a number
 
 # Make Test::Builder thread-safe for ithreads.
 BEGIN {
@@ -925,11 +920,7 @@ sub maybe_regex {
     my($re, $opts);
 
     # Check for qr/foo/
-    if (   $] >= 5.009004 
-              ? re::is_regexp($regex) 
-              : ref $regex eq 'Regexp'
-       ) 
-    {
+    if( _is_qr($regex) ) {
         $usable_regex = $regex;
     }
     # Check for '/foo/' or 'm,foo,'
@@ -1405,13 +1396,13 @@ sub _open_testhandles {
 
 
 sub _copy_io_layers {
-    my($self, $src, $dest) = @_;
+    my($self, $src, $dst) = @_;
     
     $self->_try(sub {
         require PerlIO;
-        my @layers = PerlIO::get_layers($src);
-        
-        binmode $dest, join " ", map ":$_", @layers if @layers;
+        my @src_layers = PerlIO::get_layers($src);
+
+        binmode $dst, join " ", map ":$_", @src_layers if @src_layers;
     });
 }