[Catalyst-commits] r8119 - in trunk/CatalystX-Imports: . lib/CatalystX

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2008-07-15 17:18:41 +0100 (Tue, 15 Jul 2008)
New Revision: 8119

Modified:
   trunk/CatalystX-Imports/Makefile.PL
   trunk/CatalystX-Imports/lib/CatalystX/Imports.pm
Log:
Revert "Use Scope::Guard and %^H instead of Filter::EOF."

This reverts commit 16523f69dafcea4ceed6e1bf35398817cc86b578.

The commit was faulty anyway as it didn't remove all uses of
Filter::EOF. When those are removed too the tests fail.

Modified: trunk/CatalystX-Imports/Makefile.PL
===================================================================
--- trunk/CatalystX-Imports/Makefile.PL	2008-07-14 20:20:31 UTC (rev 8118)
+++ trunk/CatalystX-Imports/Makefile.PL	2008-07-15 16:18:41 UTC (rev 8119)
@@ -10,7 +10,7 @@
 all_from        q{lib/CatalystX/Imports.pm};
 
 requires        q{Carp::Clan},                  0;
-requires        q{Scope::Guard},                0;
+requires        q{Filter::EOF},                 '0.02';
 requires        q{Class::Inspector},            0;
 requires        q{List::MoreUtils},             '0.19';
 requires        q{Scalar::Util},                '1.19';

Modified: trunk/CatalystX-Imports/lib/CatalystX/Imports.pm
===================================================================
--- trunk/CatalystX-Imports/lib/CatalystX/Imports.pm	2008-07-14 20:20:31 UTC (rev 8118)
+++ trunk/CatalystX-Imports/lib/CatalystX/Imports.pm	2008-07-15 16:18:41 UTC (rev 8119)
@@ -17,10 +17,8 @@
 
 use Class::Inspector;
 use Carp::Clan        qw{ ^CatalystX::Imports(?:::|$) };
-use Scope::Guard;
+use Filter::EOF;
 
-our $SCOPE_GUARD = 'CatalystX-Imports-Guard';
-
 =head1 VERSION
 
 0.02
@@ -136,10 +134,9 @@
     my $caller = scalar caller;
 
     # call install_action_wrap_into after package runtime
-    $^H |= 0x120000;
-
-    $^H{ $SCOPE_GUARD } = Scope::Guard->new(sub {
-        $class->install_action_wrap_into($caller);
+    Filter::EOF->on_eof_call( sub {
+        my $eof = shift;
+        $$eof = "; ${class}->install_action_wrap_into('${caller}'); 1;";
     });
 
     # call current export mechanism