X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FGeneral.pm;h=609d91480210da7fefe40bfe5c5c4e16d6a1daa4;hp=5c697e92e1a058e495245f81fac36f93cb0de10e;hb=766100bdb8cc2f48b73464a9364a1dab276d186e;hpb=eb6669bf50b06d26f044f070ac3dd82adcea5150 diff --git a/lib/Config/Any/General.pm b/lib/Config/Any/General.pm index 5c697e9..609d914 100644 --- a/lib/Config/Any/General.pm +++ b/lib/Config/Any/General.pm @@ -46,13 +46,10 @@ sub load { my $file = shift; my $args = shift || {}; - # work around bug (?) in Config::General - # return if $class->_test_perl($file); - $args->{ -ConfigFile } = $file; require Config::General; - Config::General->VERSION('2.47'); + Config::General->VERSION( '2.47' ); $args->{ -ForceArray } = 1 unless exists $args->{ -ForceArray }; @@ -62,20 +59,6 @@ sub load { return $config; } -# this is a bit of a hack but necessary, because Config::General is *far* too lax -# about what it will load -- specifically, it seems to be quite happy to load a Perl -# config file (ie, a file which is valid Perl and creates a hashref) as if it were -# an Apache-style configuration file, presumably due to laziness on the part of the -# developer. - -sub _test_perl { - my ( $class, $file ) = @_; - my $is_perl_src; - eval { $is_perl_src = do "$file"; }; - delete $INC{ $file }; # so we don't screw stuff later on - return defined $is_perl_src; -} - =head2 requires_all_of( ) Specifies that this module requires L in order to work. @@ -90,7 +73,7 @@ Brian Cassidy Ebricas@cpan.orgE =head1 CONTRIBUTORS -Joel Bernstein C<< >> +Joel Bernstein Erataxis@cpan.orgE =head1 COPYRIGHT AND LICENSE @@ -116,4 +99,3 @@ it under the same terms as Perl itself. =cut 1; -