X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=8cb6866de04e950970ff851c2c5bb69002fd84f8;hb=76b3b58612f33b9e30d982d7c412027b429f976e;hp=0e95451013bb3f61b2f5bb652b8df17f19f3c741;hpb=e31b525c69917c8cc685ada77222d8d31a8263df;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 0e95451..8cb6866 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -1,5 +1,9 @@ package Catalyst; +# we don't need really need this, but if we load it before MRO::Compat gets +# loaded (via Moose and Class::MOP), we can avoid some nasty warnings +use Class::C3; + use Moose; extends 'Catalyst::Component'; use bytes; @@ -76,7 +80,7 @@ __PACKAGE__->stats_class('Catalyst::Stats'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.8000_02'; +our $VERSION = '5.8000_04'; sub import { my ( $class, @arguments ) = @_; @@ -526,7 +530,7 @@ sub _comp_names { sub _filter_component { my ( $c, $comp, @args ) = @_; - if ( Scalar::Util::blessed($c) && eval { $comp->can('ACCEPT_CONTEXT'); } ) { + if ( eval { $comp->can('ACCEPT_CONTEXT'); } ) { return $comp->ACCEPT_CONTEXT( $c, @args ); }