From: Brian Cassidy Date: Tue, 10 Sep 2013 18:27:03 +0000 (-0300) Subject: remove old YAML warning X-Git-Tag: v0.24~2 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0026ed83b1e0520258a743cb5e69f3d0c2792105;p=p5sagit%2FConfig-Any.git remove old YAML warning --- diff --git a/Changes b/Changes index 6f433d8..8e3c213 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,8 @@ Revision history for Config-Any +0.24 2013-09-10 + - remove 4-year-old warning about YAML::XS not being installed + 0.23 2011-07-13 - fix test suite's method of checking availability of plugins diff --git a/lib/Config/Any/YAML.pm b/lib/Config/Any/YAML.pm index a12c74f..0281bb4 100644 --- a/lib/Config/Any/YAML.pm +++ b/lib/Config/Any/YAML.pm @@ -41,8 +41,6 @@ Attempts to load C<$file> as a YAML file. =cut -our $NO_YAML_XS_WARNING; - sub load { my $class = shift; my $file = shift; @@ -52,11 +50,6 @@ sub load { 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 ( $@ ) { open( my $fh, $file ) or die $!; @@ -84,7 +77,7 @@ Brian Cassidy Ebricas@cpan.orgE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2011 by Brian Cassidy +Copyright 2006-2013 by Brian Cassidy This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/t/10-branches.t b/t/10-branches.t index 96d4cab..40df34b 100644 --- a/t/10-branches.t +++ b/t/10-branches.t @@ -8,7 +8,6 @@ use Test::More tests => 11; use_ok( 'Config::Any' ); use_ok( 'Config::Any::YAML' ); -$Config::Any::YAML::NO_YAML_XS_WARNING = 1; { my @warnings; diff --git a/t/20-parse.t b/t/20-parse.t index 7396003..bd834ba 100644 --- a/t/20-parse.t +++ b/t/20-parse.t @@ -14,8 +14,6 @@ use Config::Any::Perl; use Config::Any::XML; use Config::Any::YAML; -$Config::Any::YAML::NO_YAML_XS_WARNING = 1; - our %ext_map = ( conf => 'Config::Any::General', ini => 'Config::Any::INI', diff --git a/t/55-yaml.t b/t/55-yaml.t index caf6f66..7b7b5bc 100644 --- a/t/55-yaml.t +++ b/t/55-yaml.t @@ -5,8 +5,6 @@ no warnings 'once'; use Test::More; use Config::Any::YAML; -$Config::Any::YAML::NO_YAML_XS_WARNING = 1; - if ( !Config::Any::YAML->is_supported ) { plan skip_all => 'YAML format not supported'; } diff --git a/t/62-multi.t b/t/62-multi.t index 7ac9f8c..90369bf 100644 --- a/t/62-multi.t +++ b/t/62-multi.t @@ -7,8 +7,6 @@ use Test::More tests => 3; use Config::Any; use Config::Any::YAML; -$Config::Any::YAML::NO_YAML_XS_WARNING = 1; - my $file = 't/multi/conf.yml'; my @expect = ( { name => 'TestApp',