[Catalyst-commits] r12529 - in Catalyst-Runtime/5.80/trunk: lib t

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-01-05 00:28:35 +0000 (Tue, 05 Jan 2010)
New Revision: 12529

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
   Catalyst-Runtime/5.80/trunk/t/deprecated.t
Log:
Stop supressing Adopt::NEXT warnings.

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2010-01-05 00:01:31 UTC (rev 12528)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2010-01-05 00:28:35 UTC (rev 12529)
@@ -79,12 +79,6 @@
 # Remember to update this in Catalyst::Runtime as well!
 
 our $VERSION = '5.80016';
-
-{
-    my $dev_version = $VERSION =~ /_\d{2}$/;
-    *_IS_DEVELOPMENT_VERSION = sub () { $dev_version };
-}
-
 $VERSION = eval $VERSION;
 
 sub import {
@@ -97,11 +91,6 @@
     my $caller = caller();
     return if $caller eq 'main';
 
-    # Kill Adopt::NEXT warnings if we're a non-RC version
-    unless (_IS_DEVELOPMENT_VERSION()) {
-        Class::C3::Adopt::NEXT->unimport(qr/^Catalyst::/);
-    }
-
     my $meta = Moose::Meta::Class->initialize($caller);
     unless ( $caller->isa('Catalyst') ) {
         my @superclasses = ($meta->superclasses, $class, 'Catalyst::Controller');

Modified: Catalyst-Runtime/5.80/trunk/t/deprecated.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/deprecated.t	2010-01-05 00:01:31 UTC (rev 12528)
+++ Catalyst-Runtime/5.80/trunk/t/deprecated.t	2010-01-05 00:28:35 UTC (rev 12529)
@@ -39,7 +39,4 @@
 ok( my $response = request('http://localhost/'), 'Request' );
 is( $response->header('X-Catalyst-Plugin-Deprecated'), '1', 'NEXT plugin ran correctly' );
 
-SKIP: {
-    skip 'non-dev release', 1 unless Catalyst::_IS_DEVELOPMENT_VERSION();
-    is( $warnings, 1, 'Got one and only one Adopt::NEXT warning');
-}
+is( $warnings, 1, 'Got one and only one Adopt::NEXT warning');