summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-08 02:45:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-08 02:45:23 +0000
commit23d104a1611f4dd442b24980d37e8c344a529c56 (patch)
tree3818d88ad38bc08a66ce2107da5a54936ea82a2a /lib
parent3a45ac8af15bf5b6074820b02ef9e50e0717fa3c (diff)
* lib/yaml.rb: use Psych if only it is loaded already.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/yaml.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/yaml.rb b/lib/yaml.rb
index b1c6a70dde..9b5a9b2787 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -30,6 +30,8 @@ module YAML
ENGINE = YAML::EngineManager.new
end
+engine = (!defined?(Syck) && defined?(Psych) ? 'psych' : 'syck')
+
module Syck
ENGINE = YAML::ENGINE
end
@@ -38,4 +40,4 @@ module Psych
ENGINE = YAML::ENGINE
end
-YAML::ENGINE.yamler = 'syck'
+YAML::ENGINE.yamler = engine