add unimport into

diff --git a/lib/Moose.pm b/lib/Moose.pm
index 3491d2e..02e4c3c 100644 (file)
--- a/lib/Moose.pm
+++ b/lib/Moose.pm
@@ -203,12 +203,16 @@ use Moose::Util::TypeConstraints;
         }
     );
 
-    sub import {
-        $CALLER =
-            ref $_[1] && defined $_[1]->{into} ? $_[1]->{into}
+    sub get_caller{
+        return ref $_[1] && defined $_[1]->{into} ? $_[1]->{into}
           : ref $_[1]
           && defined $_[1]->{into_level} ? caller( $_[1]->{into_level} )
           :                                caller();
+    }
+
+    sub import {
+        $CALLER = get_caller(@_);
+            
         strict->import;
         warnings->import;
 
@@ -222,7 +226,7 @@ use Moose::Util::TypeConstraints;
 
     sub unimport {
         no strict 'refs';
-        my $class = caller();
+        my $class = get_caller(@_);
 
         # loop through the exports ...
         foreach my $name ( keys %exports ) {