From 23d104a1611f4dd442b24980d37e8c344a529c56 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 8 Apr 2010 02:45:23 +0000 Subject: * 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 --- lib/yaml.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/yaml.rb') 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 -- cgit v1.2.3