still failing some tests. waiting for suggestions on whether to fix old CDIretardedness

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

diff --git a/lib/Catalyst/AttrContainer.pm b/lib/Catalyst/AttrContainer.pm
index ddfe0ab..060ee59 100644 (file)
--- a/lib/Catalyst/AttrContainer.pm
+++ b/lib/Catalyst/AttrContainer.pm
@@ -1,18 +1,12 @@
 package Catalyst::AttrContainer;
 
 use Moose;
-#use strict;
-#use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
-
 use Catalyst::Exception;
-use NEXT;
 
-#dont want to ISA a C::D::I
-use Class::Data::Inheritable;
-{
-  my $mk_classdata = Class::Data::Inheritable->can('mk_classdata');
-  __PACKAGE__->meta->add_method(mk_classdata => $mk_classdata);
-}
+with 'Catalyst::ClassData';
+use Scalar::Util 'blessed';
+
+no Moose;
 
 __PACKAGE__->mk_classdata($_) for qw/_attr_cache _action_cache/;
 __PACKAGE__->_attr_cache( {} );
@@ -37,7 +31,7 @@ Catalyst::AttrContainer
 
 =head1 DESCRIPTION
 
-This class sets up the code attribute cache.  It's a base class for
+This class sets up the code attribute cache.  It's a base class for 
 L<Catalyst::Controller>.
 
 =head1 METHODS