Remove 10897, this hack kinda works, but then leads to more issues. Gonna branch

diff --git a/Changes b/Changes
index aab4a17..70a4777 100644 (file)
--- a/Changes
+++ b/Changes
@@ -10,8 +10,6 @@
        - Deleted the Restarter engine and its Watcher code. Use the
          new Catalyst::Restarter in a recent Catalyst::Devel instead.
        - New unit test for Catalyst::Action 'unit_core_action.t' (groditi)
-       - Components being anonymous classes at runtime is now correctly dealt with
-         by class2appclass to support CatalystX::Component::Traits
 
   New features:
        - private_path method for Catalyst::Action + docs + tests (groditi)

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index 22675a9..05248fc 100644 (file)
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -8,8 +8,8 @@ use Path::Class;
 use URI;
 use Carp qw/croak/;
 use Cwd;
+
 use String::RewritePrefix;
-use Moose::Util qw/find_meta/;
 
 use namespace::clean;
 
@@ -49,19 +49,6 @@ sub appprefix {
 
 sub class2appclass {
     my $class = shift || '';
-
-    # Special move to deal with components which are anon classes.
-    # Specifically, CX::Component::Traits c072fb2
-    my $meta = find_meta($class);
-    if ($meta) {
-        while ($meta->is_anon_class) {
-            my @superclasses = $meta->superclasses;
-            return if scalar(@superclasses) > 1; # Fail silently, MI, can't deal..
-            $class = $superclasses[0];
-            $meta = find_meta($class);
-        }
-    }
-
     my $appname = '';
     if ( $class =~ /^(.+?)::([MVC]|Model|View|Controller)::.+$/ ) {
         $appname = $1;