summaryrefslogtreecommitdiff
path: root/lib/puppet/parser
diff options
context:
space:
mode:
authorKen Barber <ken@bob.sh>2011-10-25 16:31:47 -0700
committerKen Barber <ken@bob.sh>2011-10-25 16:31:47 -0700
commit97d1c692f11b841754816d3f83f2c7cebf6e649d (patch)
tree1a8a04ced18c97b45b847f6697f34ad1321e24de /lib/puppet/parser
parentd65fafd7ef17b7c80f121ca56a3e87ce39947775 (diff)
parentb58810089f783205ffdb840dc254a1d3e9f84b88 (diff)
downloadpuppet-stdlib-97d1c692f11b841754816d3f83f2c7cebf6e649d.tar.gz
puppet-stdlib-97d1c692f11b841754816d3f83f2c7cebf6e649d.tar.bz2
Merge pull request #19 from nanliu/ticket/10285
(#10285) Refactor json to use pson instead.
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r--lib/puppet/parser/functions/parsejson.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/puppet/parser/functions/parsejson.rb b/lib/puppet/parser/functions/parsejson.rb
index cf3b12c..a9a16a4 100644
--- a/lib/puppet/parser/functions/parsejson.rb
+++ b/lib/puppet/parser/functions/parsejson.rb
@@ -15,11 +15,9 @@ structure.
end
json = arguments[0]
-
- require 'json'
-
- JSON.load(json)
+ # PSON is natively available in puppet
+ PSON.load(json)
end
end