r68094 - in /branches/upstream/libdata-dump-streamer-perl/current: Changes META.yml lib/Data/Dump/Streamer.pm t/madness.t

angelabad-guest at users.alioth.debian.org angelabad-guest at users.alioth.debian.org
Wed Feb 2 12:34:37 UTC 2011


Author: angelabad-guest
Date: Wed Feb  2 12:34:18 2011
New Revision: 68094

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68094
Log:
[svn-upgrade] new version libdata-dump-streamer-perl (2.31)

Modified:
    branches/upstream/libdata-dump-streamer-perl/current/Changes
    branches/upstream/libdata-dump-streamer-perl/current/META.yml
    branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm
    branches/upstream/libdata-dump-streamer-perl/current/t/madness.t

Modified: branches/upstream/libdata-dump-streamer-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/Changes?rev=68094&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/Changes (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/Changes Wed Feb  2 12:34:18 2011
@@ -1,3 +1,6 @@
+2.31
+React to Strawberry perl $. strangeness [RT #58528]
+
 2.29
 Add .answer to .gitignore
 Update t/madness for perl-5.6

Modified: branches/upstream/libdata-dump-streamer-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/META.yml?rev=68094&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/META.yml (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/META.yml Wed Feb  2 12:34:18 2011
@@ -31,10 +31,10 @@
 provides:
   Data::Dump::Streamer:
     file: lib/Data/Dump/Streamer.pm
-    version: 2.29
+    version: 2.31
   Data::Dump::Streamer::Deparser:
     file: lib/Data/Dump/Streamer.pm
-    version: 2.29
+    version: 2.31
 recommends:
   Algorithm::Diff: 0
   Compress::Zlib: 0
@@ -60,4 +60,4 @@
   warnings::register: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 2.29
+version: 2.31

Modified: branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm?rev=68094&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm Wed Feb  2 12:34:18 2011
@@ -35,7 +35,7 @@
 BEGIN{ $HasPadWalker=eval "use PadWalker 0.99; 1"; }
 
 BEGIN {
-    $VERSION   ='2.29';
+    $VERSION   ='2.31';
     $VERSION = eval $VERSION; # used for beta stuff.
     @ISA       = qw(Exporter DynaLoader);
     @EXPORT=qw(Dump DumpLex DumpVars);
@@ -3705,7 +3705,7 @@
 our @ISA=qw(B::Deparse);
 my %cache;
 
-our $VERSION = '2.29';
+our $VERSION = '2.31';
 if ( $VERSION ne $Data::Dump::Streamer::VERSION ) {
     die "Incompatible Data::Dump::Streamer::Deparser v$VERSION vs Data::Dump::Streamer v$Data::Dump::Streamer::VERSION";
 }

Modified: branches/upstream/libdata-dump-streamer-perl/current/t/madness.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/t/madness.t?rev=68094&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/t/madness.t (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/t/madness.t Wed Feb  2 12:34:18 2011
@@ -216,6 +216,16 @@
 "left",   "middle", "right"
 .
 
+    my $expected_dot;
+    if ( defined $. && length $. ) {
+        $expected_dot = $.;
+    }
+    elsif ( defined $. ) {
+        $expected_dot = "''";
+    }
+    else {
+        $expected_dot = 'undef';
+    }
     my %hash = (
         UND => undef,
         IV  => 1,
@@ -239,7 +249,7 @@
     #   IO handles are now blessed into IO::File, I guess?
     #
     if ( $] >= 5.012_000 ) {
-        same( $dump= $o->Data(\%hash)->Out, <<'EXPECT', "", $o);
+        same( $dump= $o->Data(\%hash)->Out, template( <<'EXPECT', expected_dot => $expected_dot ), "", $o);
 $HASH1 = {
            AR  => [
                     1,
@@ -266,13 +276,13 @@
            PV  => 'string',
            PV8 => "ab\ncd\x{20ac}\t",
            PVM => '',
-           RV  => \do { my $v = undef },
+           RV  => \do { my $v = expected_dot },
            UND => undef
          };
 EXPECT
     }
     elsif ( $] >= 5.008_008 ) {
-        same( $dump= $o->Data(\%hash)->Out, <<'EXPECT', "", $o);
+        same( $dump= $o->Data(\%hash)->Out, template( <<'EXPECT', expected_dot => $expected_dot ), "", $o);
 $HASH1 = {
            AR  => [
                     1,
@@ -299,13 +309,13 @@
            PV  => 'string',
            PV8 => "ab\ncd\x{20ac}\t",
            PVM => '',
-           RV  => \do { my $v = undef },
+           RV  => \do { my $v = expected_dot },
            UND => undef
          };
 EXPECT
     }
     elsif ( $] >= 5.008_000 ) {
-        same( $dump= $o->Data(\%hash)->Out, <<'EXPECT', "", $o);
+        same( $dump= $o->Data(\%hash)->Out, template( <<'EXPECT', expected_dot => $expected_dot ), "", $o);
 $HASH1 = {
            AR  => [
                     1,
@@ -332,13 +342,13 @@
            PV  => 'string',
            PV8 => "ab\ncd\x{20ac}\t",
            PVM => '',
-           RV  => \do { my $v = undef },
+           RV  => \do { my $v = expected_dot },
            UND => undef
          };
 EXPECT
     }
     else {
-        same( $dump= $o->Data(\%hash)->Out, <<'EXPECT', "", $o);
+        same( $dump= $o->Data(\%hash)->Out, template( <<'EXPECT', expected_dot => $expected_dot ), "", $o);
 $HASH1 = {
            AR  => [
                     1,
@@ -357,12 +367,22 @@
            PV  => 'string',
            PV8 => "ab\ncd\x{20ac}\t",
            PVM => '',
-           RV  => \do { my $v = undef },
+           RV  => \do { my $v = expected_dot },
            UND => undef
          };
 EXPECT
     }
 }
+
+sub template {
+    my ( $pattern, %replacements ) = @_;
+
+    for ( keys %replacements ) {
+        $pattern =~ s/$_/$replacements{$_}/g;
+    }
+
+    return $pattern;
+}
 __END__
 
 # with eval testing




More information about the Pkg-perl-cvs-commits mailing list