[Catalyst-commits] r10102 - in Catalyst-Runtime/5.80/trunk: . lib

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-05-12 22:12:00 +0000 (Tue, 12 May 2009)
New Revision: 10102

Modified:
   Catalyst-Runtime/5.80/trunk/Makefile.PL
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Log:
Change back to B::Hooks::EndOfScope as it previously appeared to fix it - I don't have a live example any more, so this is speculative to get someone to try trunk

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-05-12 18:32:30 UTC (rev 10101)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-05-12 22:12:00 UTC (rev 10102)
@@ -6,7 +6,7 @@
 all_from 'lib/Catalyst/Runtime.pm';
 
 requires 'namespace::clean';
-requires 'Scope::Upper' => '0.06';
+requires 'B::Hooks::EndOfScope' => '0.08';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801';
 requires 'Class::MOP' => '0.83';
 requires 'Moose' => '0.76';

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-05-12 18:32:30 UTC (rev 10101)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-05-12 22:12:00 UTC (rev 10102)
@@ -4,7 +4,7 @@
 extends 'Catalyst::Component';
 use Moose::Util qw/find_meta/;
 use bytes;
-use Scope::Upper ();
+use B::Hooks::EndOfScope ();
 use Catalyst::Exception;
 use Catalyst::Log;
 use Catalyst::Request;
@@ -1099,7 +1099,7 @@
     # Note however that we have to do the work on scope end, so that method
     # modifiers work correctly in MyApp (as you have to call setup _before_
     # applying modifiers).
-    Scope::Upper::reap(sub {
+    B::Hooks::EndOfScope::on_scope_end {
         my $meta = Class::MOP::get_metaclass_by_name($class);
         if ( $meta->is_immutable && ! { $meta->immutable_options }->{inline_constructor} ) {
             die "You made your application class ($class) immutable, "
@@ -1108,7 +1108,7 @@
                 . "(replace_constructor => 1) when making your class immutable.\n";
         }
         $meta->make_immutable(replace_constructor => 1) unless $meta->is_immutable;
-    }, Scope::Upper::SCOPE(1));
+    };
 
     $class->setup_finalize;
 }