diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-04 09:35:20 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-04 09:35:20 -0800 |
| commit | cf32a59ed6134d417503448c951b137aeceba81d (patch) | |
| tree | b2d0b21f0796ca39d598579a5bc5996204e8cf08 /activerecord/lib/active_record/core.rb | |
| parent | e094b8d251550128a2986b9efed7ab725b439546 (diff) | |
| parent | 7d26fad384a99aea27e478474f5b8d24ae33b704 (diff) | |
| download | rails-cf32a59ed6134d417503448c951b137aeceba81d.tar.gz rails-cf32a59ed6134d417503448c951b137aeceba81d.tar.bz2 rails-cf32a59ed6134d417503448c951b137aeceba81d.zip | |
Merge pull request #4298 from rafaelfranca/patch-2
Remove rescue block to require psych gem
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index 980f8fe50f..0755379a74 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -317,26 +317,6 @@ module ActiveRecord "#<#{self.class} #{inspection}>" end - # Hackery to accomodate Syck. Remove for 4.0. - def to_yaml(opts = {}) #:nodoc: - if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? - super - else - coder = {} - encode_with(coder) - YAML.quick_emit(self, opts) do |out| - out.map(taguri, to_yaml_style) do |map| - coder.each { |k, v| map.add(k, v) } - end - end - end - end - - # Hackery to accomodate Syck. Remove for 4.0. - def yaml_initialize(tag, coder) #:nodoc: - init_with(coder) - end - private # Under Ruby 1.9, Array#flatten will call #to_ary (recursively) on each of the elements |