X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FYAML.pm;h=563eaf9d3a1bbf982087645afa0f3432576c64a2;hp=0668de5bb0700945986bb99be9c0870063d79413;hb=2ff1869fa60acd56ea565700fb3b0116ee5c2ed5;hpb=3d43e104853baca38ec538ec030b979a7a7b0f4d diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm index 0668de5..563eaf9 100644 --- a/lib/Config/Any/YAML.pm +++ b/lib/Config/Any/YAML.pm @@ -45,13 +45,10 @@ sub load { my $class = shift; my $file = shift; - eval { require YAML::XS }; - unless ( $@ ) { + if (eval { require YAML::XS; 1 }) { return YAML::XS::LoadFile( $file ); } - - eval { require YAML::Syck; YAML::Syck->VERSION( '0.70' ) }; - unless ( $@ ) { + elsif ($] > 5.008008 && eval { require YAML::Syck; YAML::Syck->VERSION(0.70) } ) { open( my $fh, $file ) or die $!; my $content = do { local $/; <$fh> }; close $fh; @@ -69,7 +66,9 @@ L in order to work. =cut -sub requires_any_of { 'YAML::XS', [ 'YAML::Syck', '0.70' ], 'YAML' } +sub requires_any_of { + 'YAML::XS', ( $] > 5.008008 ? [ 'YAML::Syck', '0.70' ] : ()), 'YAML'; +} =head1 AUTHOR