X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fparsejson.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fparsejson.rb;h=4cc43e677252e869267f093fb025cbf8ef744113;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=f7c2896ed0996b4a32d3ec89e94b1dfdf2fa3ae2;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
index f7c2896ed..4cc43e677 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
@@ -1,28 +1,23 @@
 #
 # parsejson.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS
-This function accepts JSON as a string and converts it into the correct
-Puppet structure.
+  newfunction(:parsejson, :type => :rvalue, :doc => <<-DOC
+    This function accepts JSON as a string and converts it into the correct
+    Puppet structure.
 
-The optional second argument can be used to pass a default value that will
-be returned if the parsing of YAML string have failed.
-  EOS
-  ) do |arguments|
+    The optional second argument can be used to pass a default value that will
+    be returned if the parsing of YAML string have failed.
+  DOC
+             ) do |arguments|
     raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless arguments.length >= 1
 
     begin
-      PSON::load(arguments[0]) || arguments[1]
+      PSON.load(arguments[0]) || arguments[1]
     rescue StandardError => e
-      if arguments[1]
-        arguments[1]
-      else
-        raise e
-      end
+      raise e unless arguments[1]
+      arguments[1]
     end
-
   end
 end