mro compat stuff

r17838@martha (orig r7769):  groditi | 2008-05-21 11:23:23 -0400

diff --git a/Makefile.PL b/Makefile.PL
index 6f834b7..d785b4a 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -32,7 +32,7 @@ requires 'Tree::Simple' => '1.15';
 requires 'Tree::Simple::Visitor::FindByPath';
 requires 'URI' => '1.35';
 requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
-
+requires 'MRO::Compat';
 
 if (-e 'inc/.author') {
   build_requires 'Test::Perl::Critic';

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 0083d0d..63f3dbb 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1,6 +1,7 @@
 package Catalyst;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::Component';
 use bytes;
@@ -813,7 +814,7 @@ Catalyst> line.
 
 sub setup {
     my ( $class, @arguments ) = @_;
-
+    Class::C3::initialize;
     $class->log->warn("Running setup twice is not a good idea.")
       if ( $class->setup_finished );
 
@@ -933,6 +934,7 @@ EOF
     $class->log->_flush() if $class->log->can('_flush');
 
     $class->setup_finished(1);
+    Class::C3::initialize;
 }
 
 =head2 $c->uri_for( $path, @args?, \%query_values? )

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index a74eb29..b426530 100644 (file)
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -17,7 +17,8 @@ L<Catalyst::Controller> subclasses.
 
 =cut
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 
 has class => (is => 'rw');

diff --git a/lib/Catalyst/ActionChain.pm b/lib/Catalyst/ActionChain.pm
index 450c88e..692065a 100644 (file)
--- a/lib/Catalyst/ActionChain.pm
+++ b/lib/Catalyst/ActionChain.pm
@@ -1,6 +1,7 @@
 package Catalyst::ActionChain;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends qw(Catalyst::Action);
 

diff --git a/lib/Catalyst/ActionContainer.pm b/lib/Catalyst/ActionContainer.pm
index 31e36cd..61fd0a9 100644 (file)
--- a/lib/Catalyst/ActionContainer.pm
+++ b/lib/Catalyst/ActionContainer.pm
@@ -15,7 +15,8 @@ to represent the various dispatch points in your application.
 
 =cut
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 
 has part => (is => 'rw', required => 1, lazy => 1, default => sub { {} });

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index cf41083..1819eb8 100644 (file)
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,6 +1,7 @@
 package Catalyst::Base;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 BEGIN{ extends qw/Catalyst::Controller/ };
 no Moose;

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index cf47c27..7de7e4e 100644 (file)
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -1,6 +1,7 @@
 package Catalyst::Component;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 use MooseX::Adopt::Class::Accessor::Fast;
 use Catalyst::Utils;

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index a76337e..ba7d296 100644 (file)
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -1,7 +1,8 @@
 package Catalyst::Controller;
 
 #switch to BEGIN { extends qw/ ... /; } ?
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use base qw/Catalyst::Component Catalyst::AttrContainer/;
 use Moose;
 

diff --git a/lib/Catalyst/DispatchType.pm b/lib/Catalyst/DispatchType.pm
index d49febc..874963a 100644 (file)
--- a/lib/Catalyst/DispatchType.pm
+++ b/lib/Catalyst/DispatchType.pm
@@ -1,6 +1,7 @@
 package Catalyst::DispatchType;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose; # using it to add Moose::Object to @ISA ...
 no Moose;
 

diff --git a/lib/Catalyst/DispatchType/Chained.pm b/lib/Catalyst/DispatchType/Chained.pm
index 5bf3853..a65a198 100644 (file)
--- a/lib/Catalyst/DispatchType/Chained.pm
+++ b/lib/Catalyst/DispatchType/Chained.pm
@@ -1,6 +1,7 @@
 package Catalyst::DispatchType::Chained;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::DispatchType';
 

diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm
index 5dcf135..8984749 100644 (file)
--- a/lib/Catalyst/DispatchType/Default.pm
+++ b/lib/Catalyst/DispatchType/Default.pm
@@ -1,6 +1,7 @@
 package Catalyst::DispatchType::Default;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::DispatchType';
 

diff --git a/lib/Catalyst/DispatchType/Index.pm b/lib/Catalyst/DispatchType/Index.pm
index 1cb5bdb..ea44684 100644 (file)
--- a/lib/Catalyst/DispatchType/Index.pm
+++ b/lib/Catalyst/DispatchType/Index.pm
@@ -1,6 +1,7 @@
 package Catalyst::DispatchType::Index;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::DispatchType';
 no Moose;

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index 69e91da..98e3b97 100644 (file)
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -1,6 +1,7 @@
 package Catalyst::DispatchType::Path;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::DispatchType';
 

diff --git a/lib/Catalyst/DispatchType/Regex.pm b/lib/Catalyst/DispatchType/Regex.pm
index d21eb75..ea46f11 100644 (file)
--- a/lib/Catalyst/DispatchType/Regex.pm
+++ b/lib/Catalyst/DispatchType/Regex.pm
@@ -1,6 +1,7 @@
 package Catalyst::DispatchType::Regex;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::DispatchType::Path';
 

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 7c5134b..fd9410b 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -1,5 +1,7 @@
 package Catalyst::Dispatcher;
 
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 use Class::MOP;
 

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 0389367..3514770 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -1,6 +1,7 @@
 package Catalyst::Engine;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 with 'MooseX::Emulate::Class::Accessor::Fast';
 

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 5a09064..d04fea4 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -1,6 +1,7 @@
 package Catalyst::Engine::CGI;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::Engine';
 

diff --git a/lib/Catalyst/Engine/FastCGI.pm b/lib/Catalyst/Engine/FastCGI.pm
index 41da9b9..397bdc0 100644 (file)
--- a/lib/Catalyst/Engine/FastCGI.pm
+++ b/lib/Catalyst/Engine/FastCGI.pm
@@ -1,6 +1,7 @@
 package Catalyst::Engine::FastCGI;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::Engine::CGI';
 

diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm
index fd11fc9..80645e6 100644 (file)
--- a/lib/Catalyst/Engine/HTTP.pm
+++ b/lib/Catalyst/Engine/HTTP.pm
@@ -1,6 +1,7 @@
 package Catalyst::Engine::HTTP;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::Engine::CGI';
 no Moose;

diff --git a/lib/Catalyst/Engine/HTTP/Restarter.pm b/lib/Catalyst/Engine/HTTP/Restarter.pm
index 6b1b5f5..3eb7d04 100644 (file)
--- a/lib/Catalyst/Engine/HTTP/Restarter.pm
+++ b/lib/Catalyst/Engine/HTTP/Restarter.pm
@@ -1,6 +1,7 @@
 package Catalyst::Engine::HTTP::Restarter;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends 'Catalyst::Engine::HTTP';
 no Moose;

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index 3f67952..a45fb59 100644 (file)
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -1,6 +1,7 @@
 package Catalyst::Log;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 use Data::Dump;
 

diff --git a/lib/Catalyst/Model.pm b/lib/Catalyst/Model.pm
index 896e3ae..20ae37c 100644 (file)
--- a/lib/Catalyst/Model.pm
+++ b/lib/Catalyst/Model.pm
@@ -1,5 +1,7 @@
 package Catalyst::Model;
 
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends qw/Catalyst::Component/;
 

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index 21a26bf..33add7b 100644 (file)
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -1,6 +1,7 @@
 package Catalyst::Request;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use IO::Socket qw[AF_INET inet_aton];
 use Carp;
 use utf8;

diff --git a/lib/Catalyst/Request/Upload.pm b/lib/Catalyst/Request/Upload.pm
index 4d46417..9080f9a 100644 (file)
--- a/lib/Catalyst/Request/Upload.pm
+++ b/lib/Catalyst/Request/Upload.pm
@@ -1,6 +1,7 @@
 package Catalyst::Request::Upload;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 
 use Catalyst::Exception;

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index 3c71fde..387cd27 100644 (file)
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -1,6 +1,7 @@
 package Catalyst::Response;
 
-use Class::C3;
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 use HTTP::Headers;
 

diff --git a/lib/Catalyst/View.pm b/lib/Catalyst/View.pm
index 1e580c3..ef5a447 100644 (file)
--- a/lib/Catalyst/View.pm
+++ b/lib/Catalyst/View.pm
@@ -1,5 +1,7 @@
 package Catalyst::View;
 
+use MRO::Compat;
+use mro 'c3';
 use Moose;
 extends qw/Catalyst::Component/;
 

diff --git a/t/unit_controller_namespace.t b/t/unit_controller_namespace.t
index 90b5665..b45c839 100644 (file)
--- a/t/unit_controller_namespace.t
+++ b/t/unit_controller_namespace.t
@@ -19,6 +19,6 @@ BEGIN {
   sub config { {} };
 }
 
-is(MyApp::Controller::Foo->COMPONENT->action_namespace('Stub'), 'foo');
+is(MyApp::Controller::Foo->COMPONENT('MyApp')->action_namespace('Stub'), 'foo');
 
-is(MyApp::Controller::Root->COMPONENT->action_namespace('Stub'), '');
+is(MyApp::Controller::Root->COMPONENT('MyApp')->action_namespace('Stub'), '');