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=9eaa5f727027bca1bf0a723a851c3c057057f97b;hb=2ff1869fa60acd56ea565700fb3b0116ee5c2ed5;hpb=9113afabd42fab736a475493892eccf82fc36b9a diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm index 9eaa5f7..563eaf9 100644 --- a/lib/Config/Any/YAML.pm +++ b/lib/Config/Any/YAML.pm @@ -45,17 +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 ); } - - Carp::carp -"Using YAML::Syck or YAML to parse configs is DEPRECATED. Please install ". -"YAML::XS for proper YAML support"; - - 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; @@ -73,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 @@ -81,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.