12 files changed, 22 insertions, 129 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index d29cf82dad..5c8dbd1b47 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1,8 +1,3 @@
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 require 'set'
 require 'active_support/benchmarkable'
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
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 9ea8cf864c..339ba1e19e 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -1,10 +1,4 @@
 require 'erb'
-
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 require 'zlib'
 require 'active_support/dependencies'
diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixtures/file.rb
index 6bad36abb9..6547791144 100644
--- a/activerecord/lib/active_record/fixtures/file.rb
+++ b/activerecord/lib/active_record/fixtures/file.rb
@@ -1,8 +1,3 @@
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'erb'
 require 'yaml'
 
diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb
index 2b4ec81199..302913e095 100644
--- a/activerecord/test/cases/yaml_serialization_test.rb
+++ b/activerecord/test/cases/yaml_serialization_test.rb
@@ -1,4 +1,4 @@
-require "cases/helper"
+require 'cases/helper'
 require 'models/topic'
 
 class YamlSerializationTest < ActiveRecord::TestCase
@@ -36,22 +36,17 @@ class YamlSerializationTest < ActiveRecord::TestCase
     assert_equal({'attributes' => topic.attributes}, coder)
   end
 
-  begin
-    require 'psych'
-
-    def test_psych_roundtrip
-      topic = Topic.first
-      assert topic
-      t = Psych.load Psych.dump topic
-      assert_equal topic, t
-    end
-
-    def test_psych_roundtrip_new_object
-      topic = Topic.new
-      assert topic
-      t = Psych.load Psych.dump topic
-      assert_equal topic.attributes, t.attributes
-    end
-  rescue LoadError
+  def test_psych_roundtrip
+    topic = Topic.first
+    assert topic
+    t = Psych.load Psych.dump topic
+    assert_equal topic, t
+  end
+
+  def test_psych_roundtrip_new_object
+    topic = Topic.new
+    assert topic
+    t = Psych.load Psych.dump topic
+    assert_equal topic.attributes, t.attributes
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
index 391bdc925d..3ec7e576c8 100644
--- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
@@ -1,29 +1,9 @@
 require 'bigdecimal'
-
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 
 class BigDecimal
-  YAML_TAG = 'tag:yaml.org,2002:float'
   YAML_MAPPING = { 'Infinity' => '.Inf', '-Infinity' => '-.Inf', 'NaN' => '.NaN' }
 
-  # This emits the number without any scientific notation.
-  # This is better than self.to_f.to_s since it doesn't lose precision.
-  #
-  # Note that reconstituting YAML floats to native floats may lose precision.
-  def to_yaml(opts = {})
-    return super if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
-
-    YAML.quick_emit(nil, opts) do |out|
-      string = to_s
-      out.scalar(YAML_TAG, YAML_MAPPING[string] || string, :plain)
-    end
-  end
-
   def encode_with(coder)
     string = to_s
     coder.represent_scalar(nil, YAML_MAPPING[string] || string)
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index 6cb2ea68b3..73aa7dd89a 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -136,11 +136,6 @@ module ActiveSupport #:nodoc:
       coder.represent_scalar nil, to_str
     end
 
-    def to_yaml(*args)
-      return super() if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
-      to_str.to_yaml(*args)
-    end
-
     UNSAFE_STRING_METHODS.each do |unsafe_method|
       if 'String'.respond_to?(unsafe_method)
         class_eval <<-EOT, __FILE__, __LINE__ + 1
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index d4f309fbd7..8edd3960c7 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -1,8 +1,3 @@
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 
 YAML.add_builtin_type("omap") do |type, val|
@@ -29,20 +24,6 @@ module ActiveSupport
       coder.represent_seq '!omap', map { |k,v| { k => v } }
     end
 
-    def to_yaml(opts = {})
-      if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
-        return super
-      end
-
-      YAML.quick_emit(self, opts) do |out|
-        out.seq(taguri) do |seq|
-          each do |k, v|
-            seq.add(k => v)
-          end
-        end
-      end
-    end
-
     def nested_under_indifferent_access
       self
     end
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index d3adf671a0..1cb71012ef 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -1,4 +1,4 @@
-require "active_support/values/time_zone"
+require 'active_support/values/time_zone'
 require 'active_support/core_ext/object/acts_like'
 require 'active_support/core_ext/object/inclusion'
 
@@ -146,12 +146,6 @@ module ActiveSupport
       end
     end
 
-    def to_yaml(options = {})
-      return super if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
-
-      utc.to_yaml(options)
-    end
-
     def httpdate
       utc.httpdate
     end
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index 8119b36491..78de7fb6ab 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -291,21 +291,16 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal @ordered_hash.values, @deserialized_ordered_hash.values
   end
 
-  begin
-    require 'psych'
+  def test_psych_serialize
+    @deserialized_ordered_hash = Psych.load(Psych.dump(@ordered_hash))
 
-    def test_psych_serialize
-      @deserialized_ordered_hash = Psych.load(Psych.dump(@ordered_hash))
-
-      values = @deserialized_ordered_hash.map { |_, value| value }
-      assert_equal @values, values
-    end
+    values = @deserialized_ordered_hash.map { |_, value| value }
+    assert_equal @values, values
+  end
 
-    def test_psych_serialize_tag
-      yaml = Psych.dump(@ordered_hash)
-      assert_match '!omap', yaml
-    end
-  rescue LoadError
+  def test_psych_serialize_tag
+    yaml = Psych.dump(@ordered_hash)
+    assert_match '!omap', yaml
   end
 
   def test_has_yaml_tag
diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index 8d9911ea01..2fde07995b 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -1,9 +1,4 @@
 require 'abstract_unit'
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'active_support/core_ext/string/inflections'
 require 'yaml'
 
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index d425c9db6c..6fc127efae 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -1,10 +1,4 @@
 require 'erb'
-
-begin
-  require 'psych'
-rescue LoadError
-end
-
 require 'yaml'
 require 'optparse'
 require 'rbconfig'