r42366 - in /branches/upstream/libtest-deep-perl/current: CHANGES MANIFEST META.yml lib/Test/Deep.pm lib/Test/Deep/RegexpRef.pm lib/Test/Deep/RegexpVersion.pm t/deep_utils.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Fri Aug 21 22:09:35 UTC 2009
Author: jawnsy-guest
Date: Fri Aug 21 22:09:29 2009
New Revision: 42366
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42366
Log:
[svn-upgrade] Integrating new upstream version, libtest-deep-perl (0.106)
Added:
branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpVersion.pm
Modified:
branches/upstream/libtest-deep-perl/current/CHANGES
branches/upstream/libtest-deep-perl/current/MANIFEST
branches/upstream/libtest-deep-perl/current/META.yml
branches/upstream/libtest-deep-perl/current/lib/Test/Deep.pm
branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpRef.pm
branches/upstream/libtest-deep-perl/current/t/deep_utils.t
Modified: branches/upstream/libtest-deep-perl/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-deep-perl/current/CHANGES?rev=42366&op=diff
==============================================================================
--- branches/upstream/libtest-deep-perl/current/CHANGES (original)
+++ branches/upstream/libtest-deep-perl/current/CHANGES Fri Aug 21 22:09:29 2009
@@ -1,3 +1,12 @@
+0.106
+
+Release after dev.
+
+0.105-dev
+
+Fix for perl 5.010.1 - the code to check the version and act correctly
+on regexp refs treated .1 as behaving like 5.011.
+
0.104
Document behaviour of cmp_bag when a non ARRAY-ref argument is passed
Modified: branches/upstream/libtest-deep-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-deep-perl/current/MANIFEST?rev=42366&op=diff
==============================================================================
--- branches/upstream/libtest-deep-perl/current/MANIFEST (original)
+++ branches/upstream/libtest-deep-perl/current/MANIFEST Fri Aug 21 22:09:29 2009
@@ -34,6 +34,7 @@
lib/Test/Deep/RegexpOnly.pm
lib/Test/Deep/RegexpRef.pm
lib/Test/Deep/RegexpRefOnly.pm
+lib/Test/Deep/RegexpVersion.pm
lib/Test/Deep/ScalarRef.pm
lib/Test/Deep/ScalarRefOnly.pm
lib/Test/Deep/Set.pm
Modified: branches/upstream/libtest-deep-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-deep-perl/current/META.yml?rev=42366&op=diff
==============================================================================
--- branches/upstream/libtest-deep-perl/current/META.yml (original)
+++ branches/upstream/libtest-deep-perl/current/META.yml Fri Aug 21 22:09:29 2009
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Test-Deep
-version: 0.104
+version: 0.106
version_from: ./lib/Test/Deep.pm
installdirs: perl
requires:
Modified: branches/upstream/libtest-deep-perl/current/lib/Test/Deep.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-deep-perl/current/lib/Test/Deep.pm?rev=42366&op=diff
==============================================================================
--- branches/upstream/libtest-deep-perl/current/lib/Test/Deep.pm (original)
+++ branches/upstream/libtest-deep-perl/current/lib/Test/Deep.pm Fri Aug 21 22:09:29 2009
@@ -6,6 +6,8 @@
use Test::Deep::Cache;
use Test::Deep::Stack;
+use Test::Deep::RegexpVersion;
+
require overload;
use Scalar::Util;
@@ -25,7 +27,8 @@
$Snobby $Expects $DNE $DNE_ADDR $Shallow
);
-$VERSION = '0.104';
+$VERSION = '0.106';
+$VERSION = eval $VERSION;
require Exporter;
@ISA = qw( Exporter );
@@ -352,7 +355,7 @@
{
$cmp = scalref($data);
}
- elsif($] <= 5.010 ? ($base eq 'Regexp') : ($base eq 'REGEXP'))
+ elsif(($base eq 'Regexp') or ($base eq 'REGEXP'))
{
$cmp = regexpref($data);
}
@@ -377,7 +380,7 @@
my $reftype = Scalar::Util::reftype($val);
- if ($] <= 5.010) {
+ if ($Test::Deep::RegexpVersion::OldStyle) {
if ($blessed eq "Regexp" and $reftype eq "SCALAR")
{
$reftype = "Regexp"
Modified: branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpRef.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpRef.pm?rev=42366&op=diff
==============================================================================
--- branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpRef.pm (original)
+++ branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpRef.pm Fri Aug 21 22:09:29 2009
@@ -4,6 +4,7 @@
package Test::Deep::RegexpRef;
use Test::Deep::Ref;
+use Test::Deep::RegexpVersion;
sub init
{
@@ -22,7 +23,7 @@
my $exp = $self->{val};
- if ($] <= 5.010) {
+ if ($Test::Deep::RegexpVersion::OldStyle) {
return 0 unless $self->test_class($got, "Regexp");
return 0 unless $self->test_reftype($got, "SCALAR");
} else {
Added: branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpVersion.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpVersion.pm?rev=42366&op=file
==============================================================================
--- branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpVersion.pm (added)
+++ branches/upstream/libtest-deep-perl/current/lib/Test/Deep/RegexpVersion.pm Fri Aug 21 22:09:29 2009
@@ -1,0 +1,13 @@
+use strict;
+use warnings;
+
+package Test::Deep::RegexpVersion;
+
+use vars qw( $OldStyle );
+
+# Older versions of Perl treated Regexp refs as opaque scalars blessed
+# into the "Regexp" class. Several bits of code need this so we
+# centralise the test for that kind of version.
+$OldStyle = ($] < 5.011);
+
+1;
Modified: branches/upstream/libtest-deep-perl/current/t/deep_utils.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-deep-perl/current/t/deep_utils.t?rev=42366&op=diff
==============================================================================
--- branches/upstream/libtest-deep-perl/current/t/deep_utils.t (original)
+++ branches/upstream/libtest-deep-perl/current/t/deep_utils.t Fri Aug 21 22:09:29 2009
@@ -28,5 +28,5 @@
my ($class, $base) = class_base($a);
is($class, "Regexp", "class_base class regexp");
- is($base, ($] <= 5.010 ? "Regexp" : "REGEXP"), "class_base base regexp");
+ is($base, ($] < 5.011 ? "Regexp" : "REGEXP"), "class_base base regexp");
}
More information about the Pkg-perl-cvs-commits
mailing list