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=50a4442ecbdd5bac5020a0dd642598d5f24ab127;hp=65ce4ec9e6c1a242f30cdbf082f3231c7151485b;hb=20190ef76826de69f3b7d6c53aaabe791b08a13c;hpb=f07b7a174347e4d35f8b80f3f68024aa974e1343

diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm
index 65ce4ec..50a4442 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,22 +65,24 @@ 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
 
-Brian Cassidy E<lt>bricas@cpan.orgE<gt>
+Brian Cassidy <bricas@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2010 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>