Not warning for ^Catalyst in release versions done

diff --git a/IDEAS b/IDEAS
index 707072b..e101406 100644 (file)
--- a/IDEAS
+++ b/IDEAS
@@ -1,27 +1,5 @@
 * improve NEXT warnings. related irc conversation from 09/01/21:
 
-04:34:45  * mst wonders if that reports via caller or ref($self)
-04:35:29 < dhoss-laptop> jshirley: but but but i'm not
-04:36:01 <@jshirley> Oh, latest Catalyst::View::TT does
-04:36:11 <@jshirley> I thought that was well tested on 5.8
-04:36:18  * dhoss-laptop thought so too
-04:36:25 < dhoss-laptop> *and* config loader
-04:36:52 < dhoss-laptop> would that be any reason for my templates not being found? or would that be a whole different case? my code looks fine
-                         in my view
-04:37:15 <@rafl> mst: ref $self, currently
-04:37:24 < shadowpaste> "dhoss-laptop" at 76.10.60.8 pasted "pasting anyway" (15 lines) at http://scsys.co.uk:8001/22854
-04:37:48 <@rafl> which admittedly sucks a little
-04:37:50 <@mst> rafl: mm. caller would be better in terms of reporting the error against the package it's meant to be reported against
-04:37:55 <@rafl> right
-04:38:14 <@mst> I also wonder if we should exclude /^Catalyst::/ stuff and then do a pass across CPAN reporting bugs against people
-04:38:47 <@mst> rather than having people's apps scream at them just because an author is being a prat
-04:39:02 <@rafl> patch, anyone? git://github.com/rafl/class-c3-adopt-next.git
-04:39:16 <@rafl> i'd prefer not to exclude ^Catalyst
-04:39:55 <@mst> well, I was thinking an import argument
-04:40:02 <@rafl> the more annoying it is, the more likely it is to be fixed by authors is what i was thinking
-04:40:08 <@mst> so Catalyst can ask you to exclude ^Catalyst
-04:40:30 <@rafl> figured that
-04:41:04 <@mst> hrm
 04:41:15 <@mst> actually, even better, it can pass an exclude list
 04:41:22 <@mst> and an include list with versions that contain fixage
 04:41:39 <@mst> then as shit on CPAN gets fixed it can start warning that you should upgrade

diff --git a/Makefile.PL b/Makefile.PL
index cc00a09..524248a 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,7 +10,7 @@ requires 'Scope::Upper' => '0.06';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00800';
 requires 'Moose' => '0.70';
 requires 'Carp';
-requires 'Class::C3::Adopt::NEXT' => '0.05';
+requires 'Class::C3::Adopt::NEXT' => '0.07';
 requires 'Class::MOP';
 requires 'CGI::Simple::Cookie';
 requires 'Data::Dump';

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 162c1bf..39a9c32 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -22,6 +22,7 @@ use URI::http;
 use URI::https;
 use Tree::Simple qw/use_weak_refs/;
 use Tree::Simple::Visitor::FindByUID;
+use Class::C3::Adopt::NEXT;
 use attributes;
 use utf8;
 use Carp qw/croak carp shortmess/;
@@ -86,6 +87,12 @@ sub import {
 
     my $caller = caller();
     return if $caller eq 'main';
+
+    # Kill Adopt::NEXT warnings if we're a non-RC version
+    if ($VERSION !~ /_\d{2}$/) {
+        Class::C3::Adopt::NEXT->unimport(qr/^Catalyst/);
+    }
+
     my $meta = Moose::Meta::Class->initialize($caller);
     #Moose->import({ into => $caller }); #do we want to do this?