X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FConfig%2FAny%2FYAML.pm;h=1f612211da5ebe806012efa3feed1ea61544eab2;hb=3f3b3137bffa7baf8d1204e7a99d6ab23de4686b;hp=8efee7754572e9ddab9c17169178b763b78ea12f;hpb=d7eb7b5ca6dd18e740943079a1585661cec4d81f;p=p5sagit%2FConfig-Any.git

diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm
index 8efee77..1f61221 100644
--- a/lib/Config/Any/YAML.pm
+++ b/lib/Config/Any/YAML.pm
@@ -21,7 +21,6 @@ Loads YAML files. Example:
         foo: bar
     Model::Baz:
         qux: xyzzy
-    
 
 =head1 METHODS
 
@@ -45,17 +44,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
-        'Use of YAML::Syck or YAML to parse config files 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 +65,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
 
@@ -81,14 +75,14 @@ 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. 
+it under the same terms as Perl itself.
 
 =head1 SEE ALSO
 
-=over 4 
+=over 4
 
 =item * L<Catalyst>