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=c852ef49da10382a3bd13cc476995398492aaa17;hb=2ff1869fa60acd56ea565700fb3b0116ee5c2ed5;hpb=c793253e5f2ad3ca9d60e96e07a5d87fa344ec31 diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm index c852ef4..563eaf9 100644 --- a/lib/Config/Any/YAML.pm +++ b/lib/Config/Any/YAML.pm @@ -5,6 +5,8 @@ use warnings; use base 'Config::Any::Base'; +use Carp (); + =head1 NAME Config::Any::YAML - Load YAML config files @@ -43,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; @@ -62,12 +61,14 @@ sub load { =head2 requires_any_of( ) -Specifies that this modules requires one of L (0.70) or L in -order to work. +Specifies that this modules requires one of L, L (0.70) or +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 @@ -75,7 +76,7 @@ Brian Cassidy Ebricas@cpan.orgE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2009 by Brian Cassidy +Copyright 2006-2016 by Brian Cassidy This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. @@ -88,6 +89,8 @@ it under the same terms as Perl itself. =item * L +=item * L + =item * L =item * L