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=c07229321832528581dd05865cd38f05e7e5e81f;hp=7bb1d1bbf385bee2ea846692e2253e63c42444f2;hb=3adc3480014aae487da279703125827ef0cb039e;hpb=9dbebe277d9dc4fef8eee9a57b8e2475a125b403

diff --git a/lib/Config/Any/General.pm b/lib/Config/Any/General.pm
index 7bb1d1b..c072293 100644
--- a/lib/Config/Any/General.pm
+++ b/lib/Config/Any/General.pm
@@ -45,12 +45,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.48' );
 
     $args->{ -ForceArray } = 1 unless exists $args->{ -ForceArray };
 
@@ -60,48 +58,34 @@ 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<Config::General> in order to work.
 
 =cut
 
-sub requires_all_of { [ 'Config::General', '2.47' ] }
+sub requires_all_of { [ 'Config::General' => '2.48' ] }
 
 =head1 AUTHOR
 
-Brian Cassidy E<lt>bricas@cpan.orgE<gt>
+Brian Cassidy <bricas@cpan.org>
 
 =head1 CONTRIBUTORS
 
-Joel Bernstein C<< <rataxis@cpan.org> >>
+Joel Bernstein <rataxis@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2010 by Brian Cassidy
+Copyright 2006-2016 by Brian Cassidy
 
 Portions Copyright 2006 Portugal Telecom
 
 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>
 
@@ -114,4 +98,3 @@ it under the same terms as Perl itself.
 =cut
 
 1;
-