diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/yaml.rb | 2 | ||||
-rw-r--r-- | lib/yaml/rubytypes.rb | 3 | ||||
-rw-r--r-- | lib/yaml/types.rb | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/lib/yaml.rb b/lib/yaml.rb index b5852b2257..a8bba691f0 100644 --- a/lib/yaml.rb +++ b/lib/yaml.rb @@ -9,7 +9,7 @@ module YAML begin - require 'syck' + require 'yaml/syck' @@parser = YAML::Syck::Parser @@loader = YAML::Syck::DefaultLoader rescue LoadError diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb index 1a9c4ef67a..666618e49c 100644 --- a/lib/yaml/rubytypes.rb +++ b/lib/yaml/rubytypes.rb @@ -3,9 +3,6 @@ require 'date' # Type conversions # -# Ruby 1.6.x Object#object_id -class Object; alias_method :object_id, :id; end unless Object.respond_to? :object_id - class Object def is_complex_yaml? true diff --git a/lib/yaml/types.rb b/lib/yaml/types.rb index b34c38fe71..294fb36a57 100644 --- a/lib/yaml/types.rb +++ b/lib/yaml/types.rb @@ -2,9 +2,6 @@ # Classes required by the full core typeset # -# Ruby 1.6.x Object#object_id -class Object; alias_method :object_id, :id; end unless Object.respond_to? :object_id - module YAML # |