Stop using Class::Inspector. Class::MOP::load_class does all we need.

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

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index d27fa9c..9fd9c32 100644 (file)
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -6,7 +6,6 @@ use File::Spec;
 use HTTP::Request;
 use Path::Class;
 use URI;
-use Class::Inspector;
 use Carp qw/croak/;
 use Cwd;
 
@@ -261,7 +260,9 @@ sub ensure_class_loaded {
         if $class =~ m/\.pm$/;
 
     return if !$opts->{ ignore_loaded }
-        && Class::Inspector->loaded( $class ); # if a symbol entry exists we don't load again
+        && Class::MOP::is_class_loaded($class); # if a symbol entry exists we don't load again
+
+    # as soon as Class::MOP 0.67 + 1 is released Class::MOP::load_class($class) can be used instead
 
     # this hack is so we don't overwrite $@ if the load did not generate an error
     my $error;
@@ -274,8 +275,9 @@ sub ensure_class_loaded {
     }
 
     die $error if $error;
+
     die "require $class was successful but the package is not defined"
-        unless Class::Inspector->loaded($class);
+        unless Class::MOP::is_class_loaded($class);
 
     return 1;
 }