X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fouse.pm;h=a932c660dec63e848413c8f96b0c0648cc0f39a7;hb=86eb0b5e6f0c2d89a6c86516e7bccbf9c7daba1f;hp=6ebf64dc5a60e9a1dd198d3a5bede68891b69093;hpb=cf59b7151d2b476a74b5abd84af37770ad4cf387;p=gitmo%2FMouse.git

diff --git a/lib/ouse.pm b/lib/ouse.pm
index 6ebf64dc..a932c66 100644
--- a/lib/ouse.pm
+++ b/lib/ouse.pm
@@ -1,19 +1,17 @@
 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__