X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FComponentised.pm;h=7cb5d54b9b9f4a926d8a033bf411a38aebbb08ec;hb=6db5bdc68f2a9a725fa5fcc2d75dee743d30f7fd;hp=a42befc88cd07ebf49cd59349c7426a39ac6e2c2;hpb=bf5ecff9ac30e6acfd912ce3c72ee86b73b775dc;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Componentised.pm b/lib/DBIx/Class/Componentised.pm
index a42befc..7cb5d54 100644
--- a/lib/DBIx/Class/Componentised.pm
+++ b/lib/DBIx/Class/Componentised.pm
@@ -1,47 +1,13 @@
-package # hide from PAUSE 
+package # hide from PAUSE
     DBIx::Class::Componentised;
 
 use strict;
 use warnings;
 
-use Class::C3;
+###
+# Keep this class for backwards compatibility
+###
 
-sub inject_base {
-  my ($class, $target, @to_inject) = @_;
-  {
-    no strict 'refs';
-    unshift(@{"${target}::ISA"}, grep { $target ne $_ && !$target->isa($_)} @to_inject);
-  }
-
-  # Yes, this is hack. But it *does* work. Please don't submit tickets about
-  # it on the basis of the comments in Class::C3, the author was on #dbix-class
-  # while I was implementing this.
-
-  my $table = { Class::C3::_dump_MRO_table };
-  eval "package $target; import Class::C3;" unless exists $table->{$target};
-}
-
-sub load_components {
-  my $class = shift;
-  my $base = $class->component_base_class;
-  my @comp = map { /^\+(.*)$/ ? $1 : "${base}::$_" } grep { $_ !~ /^#/ } @_;
-  $class->_load_components(@comp);
-  Class::C3::reinitialize();
-}
-
-sub load_own_components {
-  my $class = shift;
-  my @comp = map { "${class}::$_" } grep { $_ !~ /^#/ } @_;
-  $class->_load_components(@comp);
-}
-
-sub _load_components {
-  my ($class, @comp) = @_;
-  foreach my $comp (@comp) {
-    eval "use $comp";
-    die $@ if $@;
-  }
-  $class->inject_base($class => @comp);
-}
+use base 'Class::C3::Componentised';
 
 1;