diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2012-01-04 13:30:57 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2012-01-04 13:30:57 -0300 |
| commit | 761b049b2e51a035eaf9c18f4d0200409848a28e (patch) | |
| tree | bdfed99b3d0b46ca7e2b079a46d46fa241549eab /activesupport/lib | |
| parent | 0bf51e9805260243ec0bbe5fca8f8b9364fdd970 (diff) | |
| download | rails-761b049b2e51a035eaf9c18f4d0200409848a28e.tar.gz rails-761b049b2e51a035eaf9c18f4d0200409848a28e.tar.bz2 rails-761b049b2e51a035eaf9c18f4d0200409848a28e.zip | |
No need to use rescue block to require psych
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/big_decimal/conversions.rb | 7 | ||||
| -rw-r--r-- | activesupport/lib/active_support/ordered_hash.rb | 6 |
2 files changed, 2 insertions, 11 deletions
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 403e8beac5..c2faa1ebe0 100644 --- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb +++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb @@ -1,10 +1,5 @@ require 'bigdecimal' - -begin - require 'psych' -rescue LoadError -end - +require 'psych' require 'yaml' class BigDecimal diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb index fdf4a2bda3..7fd4168363 100644 --- a/activesupport/lib/active_support/ordered_hash.rb +++ b/activesupport/lib/active_support/ordered_hash.rb @@ -1,8 +1,4 @@ -begin - require 'psych' -rescue LoadError -end - +require 'psych' require 'yaml' YAML.add_builtin_type("omap") do |type, val| |