X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=7cc3184455d51d81d01656a7566ed749929bea4a;hp=4255eecb273243c9e77ba36e267ff0516dc372e7;hb=a5d07d293f196ce3be5efa8eeead2231bbfb6304;hpb=bb33cb06497384cec8ca0baf49f793cd36cebfe4

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 4255eec..7cc3184 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1,9 +1,5 @@
 package Catalyst;
 
-# we don't need really need this, but if we load it before MRO::Compat gets
-# loaded (via Moose and Class::MOP), we can avoid some nasty warnings
-use Class::C3;
-
 use Moose;
 extends 'Catalyst::Component';
 use bytes;
@@ -25,7 +21,7 @@ use Time::HiRes qw/gettimeofday tv_interval/;
 use URI ();
 use URI::http;
 use URI::https;
-use Scalar::Util qw/weaken blessed/;
+use Scalar::Util qw/weaken/;
 use Tree::Simple qw/use_weak_refs/;
 use Tree::Simple::Visitor::FindByUID;
 use attributes;
@@ -1049,8 +1045,13 @@ EOF
     Scope::Upper::reap(sub {
         my $meta = Class::MOP::get_metaclass_by_name($class);
         $meta->make_immutable unless $meta->is_immutable;
-    }, 1);
+    }, Scope::Upper::SCOPE(1));
+
+    $class->setup_finalize;
+}
 
+sub setup_finalize {
+    my ($class) = @_;
     $class->setup_finished(1);
 }