X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FModule%2FMetadata.pm;h=9bda2dfa883c88c178e6a75b017d61ef8e6f0172;hb=d880ef1f1d4477157d7432bfd60c7ee330eb224e;hp=99cee971c71bc3b5c8d2ce845f8a00e04e0d42b0;hpb=9d50689d146d2ddb32442bce32443d614c336870;p=p5sagit%2FModule-Metadata.git

diff --git a/lib/Module/Metadata.pm b/lib/Module/Metadata.pm
index 99cee97..9bda2df 100644
--- a/lib/Module/Metadata.pm
+++ b/lib/Module/Metadata.pm
@@ -16,7 +16,7 @@ $VERSION = eval $VERSION;
 
 use File::Spec;
 use IO::File;
-use Module::Metadata::Version;
+use version 0.87;
 BEGIN {
   if ($INC{'Log/Contextual.pm'}) {
     Log::Contextual->import('log_info');
@@ -84,8 +84,8 @@ sub new_from_module {
   
   my $compare_versions = sub {
     my ($v1, $op, $v2) = @_;
-    $v1 = Module::Metadata::Version->new($v1)
-      unless UNIVERSAL::isa($v1,'Module::Metadata::Version');
+    $v1 = version->new($v1)
+      unless UNIVERSAL::isa($v1,'version');
   
     my $eval_str = "\$v1 $op \$v2";
     my $result   = eval $eval_str;
@@ -99,8 +99,7 @@ sub new_from_module {
     if ( $version =~ /[=<>!,]/ ) { # logic, not just version
       # take as is without modification
     }
-    elsif ( ref $version eq 'version' ||
-            ref $version eq 'Module::Metadata::Version' ) { # version objects
+    elsif ( ref $version eq 'version' ) { # version objects
       $version = $version->is_qv ? $version->normal : $version->stringify;
     }
     elsif ( $version =~ /^[^v][^.]*\.[^.]+\./ ) { # no leading v, multiple dots
@@ -515,7 +514,7 @@ sub _evaluate_version_line {
   $pn++; # everybody gets their own package
   my $eval = qq{BEGIN { q#  Hide from _packages_inside()
     #; package Module::Metadata::_version::p$pn;
-    use Module::Metadata::Version;
+    use version;
     no strict;
 
     local $sigil$var;
@@ -544,7 +543,7 @@ sub _evaluate_version_line {
     if $@;
 
   # Activestate apparently creates custom versions like '1.23_45_01', which
-  # cause M::B::Version to think it's an invalid alpha.  So check for that
+  # cause version.pm to think it's an invalid alpha.  So check for that
   # and strip them
   my $num_dots = () = $result =~ m{\.}g;
   my $num_unders = () = $result =~ m{_}g;
@@ -552,8 +551,8 @@ sub _evaluate_version_line {
     $result =~ s{_}{}g;
   }
 
-  # Bless it into our own version class
-  eval { $result = Module::Metadata::Version->new($result) };
+  # Upgrade it into a version object
+  eval { $result = version->new($result) };
   die "Version '$result' from $self->{filename} does not appear to be valid:\n$eval\n\nThe fatal error was: $@\n"
     if $@;