X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fouse.pm;h=a932c660dec63e848413c8f96b0c0648cc0f39a7;hb=fb4ddd8813b802fcd34aef915c5e7ce3d10e3022;hp=3026ced6f64e1161d3e524b6207dea1030453d3e;hpb=1820fffecb0bd1da64edc16ecde534178b841d14;p=gitmo%2FMouse.git

diff --git a/lib/ouse.pm b/lib/ouse.pm
index 3026ced..a932c66 100644
--- a/lib/ouse.pm
+++ b/lib/ouse.pm
@@ -1,26 +1,21 @@
 package ouse;
 
-use strict;
-use warnings;
-
-BEGIN {
-    my $package;
-    sub import { 
-        $package = $_[1] || 'Class';
-        if ($package =~ /^\+/) {
-            $package =~ s/^\+//;
-            eval "require $package; 1" or die;
-        }
+use Mouse::Util; # enables strict and warnings
+
+
+my $package = 'Class';
+sub import {
+    $package = $_[1] || 'Class';
+    if ($package =~ /^\+/) {
+        $package =~ s/^\+//;
+        Mouse::Util::load_class($package);
     }
-    use Filter::Simple sub { s/^/package $package;\nuse Mouse;\n/; }
 }
+use Filter::Simple sub { s/^/package $package;\nuse Mouse;\nuse Mouse::Util::TypeConstraints;\n/; };
 
 1;
-
 __END__
 
-=pod
-
 =head1 NAME
 
 ouse - syntactic sugar to make Mouse one-liners easier