summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-26 02:52:46 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-26 02:52:46 +0000
commit46724873b0daf109d7f249a6ca768bdb938c00da (patch)
tree9893eb0353d8c236bc335df5211551e5b45b233c /lib
parent94a6e6f6e1ab035207efb94b1f77341cd21ee4b3 (diff)
downloadruby-46724873b0daf109d7f249a6ca768bdb938c00da.tar.gz
Revert "Revert "* lib/yaml.rb: Remove Psych::EngineManager [Bug #8344]""
syck-1.0.3 gem support this imcompatible changes. This reverts commit r46102 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/yaml.rb34
1 files changed, 0 insertions, 34 deletions
diff --git a/lib/yaml.rb b/lib/yaml.rb
index 3b4e4234f7..c0ffcf877b 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -12,40 +12,6 @@ end
YAML = Psych # :nodoc:
-module Psych # :nodoc:
- # For compatibility, deprecated
- class EngineManager # :nodoc:
- attr_reader :yamler # :nodoc:
-
- def initialize # :nodoc:
- @yamler = 'psych'
- end
-
- def syck? # :nodoc:
- false
- end
-
- # Psych is always used and this method has no effect.
- #
- # This method is still present for compatibility.
- #
- # You may still use the Syck engine by installing
- # the 'syck' gem and using the Syck constant.
- def yamler= engine # :nodoc:
- case engine
- when 'syck' then warn "syck has been removed, psych is used instead"
- when 'psych' then @yamler = 'psych'
- else
- raise(ArgumentError, "bad engine")
- end
-
- engine
- end
- end
-
- ENGINE = EngineManager.new # :nodoc:
-end
-
# YAML Ain't Markup Language
#
# This module provides a Ruby interface for data serialization in YAML format.