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=a12c74f4d97fbd18449cd8f9ac7a42c379263e9f;hb=2ff1869fa60acd56ea565700fb3b0116ee5c2ed5;hpb=e7be073ac39914776ae469d6d1b51b666f6210d5

diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm
index a12c74f..563eaf9 100644
--- a/lib/Config/Any/YAML.pm
+++ b/lib/Config/Any/YAML.pm
@@ -41,24 +41,14 @@ Attempts to load C<$file> as a YAML file.
 
 =cut
 
-our $NO_YAML_XS_WARNING;
-
 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
-        'Use of YAML::Syck or YAML to parse config files is DEPRECATED. '
-        . 'Please install YAML::XS for proper YAML support'
-            unless $NO_YAML_XS_WARNING;
-
-    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;
@@ -76,7 +66,9 @@ L<YAML> 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
 
@@ -84,7 +76,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2011 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.