[Catalyst-commits] r6724 - trunk/Config-Any/lib/Config/Any

bricas at dev.catalyst.perl.org bricas at dev.catalyst.perl.org
Thu Aug 23 14:32:05 GMT 2007


Author: bricas
Date: 2007-08-23 14:32:05 +0100 (Thu, 23 Aug 2007)
New Revision: 6724

Modified:
   trunk/Config-Any/lib/Config/Any/JSON.pm
   trunk/Config-Any/lib/Config/Any/XML.pm
Log:
minor cleanup -- pass args to XML::Simple

Modified: trunk/Config-Any/lib/Config/Any/JSON.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/JSON.pm	2007-08-23 12:30:41 UTC (rev 6723)
+++ trunk/Config-Any/lib/Config/Any/JSON.pm	2007-08-23 13:32:05 UTC (rev 6724)
@@ -50,8 +50,7 @@
     eval { require JSON::Syck; };
     if( $@ ) {
         require JSON;
-        JSON->import;
-        return jsonToObj( $content );
+        return JSON::jsonToObj( $content );
     }
     else {
         return JSON::Syck::Load( $content );

Modified: trunk/Config-Any/lib/Config/Any/XML.pm
===================================================================
--- trunk/Config-Any/lib/Config/Any/XML.pm	2007-08-23 12:30:41 UTC (rev 6723)
+++ trunk/Config-Any/lib/Config/Any/XML.pm	2007-08-23 13:32:05 UTC (rev 6724)
@@ -42,12 +42,13 @@
 sub load {
     my $class = shift;
     my $file  = shift;
+    my $args  = shift || {};
 
     require XML::Simple;
-    XML::Simple->import;
-    my $config = XMLin( 
+    my $config = XML::Simple::XMLin( 
         $file, 
         ForceArray => [ qw( component model view controller ) ],
+        %$args
     );
 
     return $class->_coerce($config);




More information about the Catalyst-commits mailing list