add Psych::SyntaxError to the list of rescued YAML exceptions

JEG2 · May 25, 2011 · cae1d46 · cae1d46
1 parent 5856fc5
commit cae1d46
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/activesupport/lib/active_support/json/backends/yaml.rb b/activesupport/lib/active_support/json/backends/yaml.rb
@@ -7,6 +7,13 @@ module Yaml
         ParseError = ::StandardError
         extend self
 
+        EXCEPTIONS = [::ArgumentError] # :nodoc:
+        begin
+          require 'psych'
+          EXCEPTIONS << Psych::SyntaxError
+        rescue LoadError
+        end
+
         # Parses a JSON string or IO and converts it into an object
         def decode(json)
           if json.respond_to?(:read)