merged conflicts

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Dispatcher.pm

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index dc52594..6fde402 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -14,6 +14,7 @@ use Catalyst::Utils;
 use Text::SimpleTable;
 use Tree::Simple;
 use Tree::Simple::Visitor::FindByPath;
+use Class::Load qw(load_class try_load_class);
 
 use namespace::clean -except => 'meta';
 
@@ -516,9 +517,10 @@ sub register {
         unless ( $registered->{$class} ) {
             # FIXME - Some error checking and re-throwing needed here, as
             #         we eat exceptions loading dispatch types.
-            eval { Class::MOP::load_class($class) };
+            # see also try_load_class
+            eval { load_class($class) };
             my $load_failed = $@;
-            $self->_check_depreciated_dispatch_type( $key, $load_failed );
+            $self->_check_deprecated_dispatch_type( $key, $load_failed );
             push( @{ $self->dispatch_types }, $class->new ) unless $load_failed;
             $registered->{$class} = 1;
         }
@@ -660,9 +662,8 @@ sub _load_dispatch_types {
         # first param is undef because we cannot get the appclass
         my $class = Catalyst::Utils::resolve_namespace(undef, 'Catalyst::DispatchType', $type);
 
-        eval { Class::MOP::load_class($class) };
-        Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ )
-          if $@;
+        my ($success, $error) = try_load_class($class);
+        Catalyst::Exception->throw( message => $error ) if not $success;
         push @{ $self->dispatch_types }, $class->new;
 
         push @loaded, $class;
@@ -691,7 +692,7 @@ sub dispatch_type {
     return undef;
 }
 
-sub _check_depreciated_dispatch_type {
+sub _check_deprecated_dispatch_type {
     my ($self, $key, $load_failed) = @_;
 
     return unless $key =~ /^(Local)?Regexp?/;
@@ -702,12 +703,12 @@ sub _check_depreciated_dispatch_type {
               . "  Use Chained methods or install the standalone\n"
               . "  Catalyst::DispatchType::Regex if necessary.\n" );
     } elsif ( !defined $Catalyst::DispatchType::Regex::VERSION
-        || $Catalyst::DispatchType::Regex::VERSION <= 5.90020 ) {
+        || $Catalyst::DispatchType::Regex::VERSION le '5.90020' ) {
         # We loaded the old core version of the Regex module this will break
         warn(   "The $key DispatchType has been removed from Catalyst core.\n"
               . "  An old version of the core Catalyst::DispatchType::Regex\n"
               . "  has been loaded and will likely fail. Please remove\n"
-              . "  $INC{'Catalyst::DispatchType::Regex'}\n"
+              . "   $INC{'Catalyst/DispatchType/Regex.pm'}\n"
               . "  and use Chained methods or install the standalone\n"
               . "  Catalyst::DispatchType::Regex if necessary.\n" );
     }