Step 2: eliminate the need for import and unimport in users of

[gitmo/Moose.git] / lib / Moose.pm

diff --git a/lib/Moose.pm b/lib/Moose.pm
index 7aff9ec..701362b 100644 (file)
--- a/lib/Moose.pm
+++ b/lib/Moose.pm
@@ -115,7 +115,7 @@ sub make_immutable {
     $class->meta->make_immutable(@_);
 }
 
-my $exporter = Moose::Exporter->build_exporter(
+my $exporter = Moose::Exporter->build_import_methods(
     with_caller => [
         qw( extends with has before after around override augment make_immutable )
     ],
@@ -124,30 +124,9 @@ my $exporter = Moose::Exporter->build_exporter(
         \&Carp::confess,
         \&Scalar::Util::blessed,
     ],
+    also => sub { init_meta( shift, 'Moose::Object' ); },
 );
 
-sub import {
-    my $caller = Moose::Exporter->get_caller(@_);
-
-    # this works because both pragmas set $^H (see perldoc perlvar)
-    # which affects the current compilation - i.e. the file who use'd
-    # us - which is why we don't need to do anything special to make
-    # it affect that file rather than this one (which is already compiled)
-
-    strict->import;
-    warnings->import;
-
-    # we should never export to main
-    if ($caller eq 'main') {
-        warn qq{Moose does not export its sugar to the 'main' package.\n};
-        return;
-    }
-
-    init_meta($caller, 'Moose::Object');
-
-    goto $exporter;
-}
-
 # NOTE:
 # This is for special use by 
 # some modules and stuff, I 
@@ -163,15 +142,6 @@ sub __CURRY_EXPORTS_FOR_CLASS__ {
 #    return map { $_ => $exports{$_}->() } (@_ ? @_ : keys %exports);
 }
 
-sub unimport {
-    my $caller = Moose::Exporter->get_caller(@_);
-
-    Moose::Exporter->remove_keywords(
-        source => __PACKAGE__,
-        from   => $caller,
-    );
-}
-
 sub init_meta {
     my ( $class, $base_class, $metaclass ) = @_;
     $base_class = 'Moose::Object'      unless defined $base_class;