From: Florian Ragwitz <rafl@debian.org>
Date: Tue, 5 Jan 2010 00:28:35 +0000 (+0000)
Subject: Stop supressing Adopt::NEXT warnings.
X-Git-Tag: 5.80017~10
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=67788976eaa9f4fc233fcac585c7d186709afb85

Stop supressing Adopt::NEXT warnings.
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 6d5573d..e0c965b 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -79,12 +79,6 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 # 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 @@ sub import {
     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');
diff --git a/t/deprecated.t b/t/deprecated.t
index d9f90e0..307181b 100644
--- a/t/deprecated.t
+++ b/t/deprecated.t
@@ -39,7 +39,4 @@ is( $mvc_warnings, 1, 'Get the ::MVC:: warning' );
 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');