Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828)

Merge pull request 5828

lib/jekyll/convertible.rb

@@ -46,7 +46,7 @@ module Jekyll
           self.content = $POSTMATCH
           self.data = SafeYAML.load(Regexp.last_match(1))
         end
-      rescue SyntaxError => e
+      rescue Psych::SyntaxError => e
         Jekyll.logger.warn "YAML Exception reading #{filename}: #{e.message}"
         raise e if self.site.config["strict_front_matter"]
       rescue StandardError => e

lib/jekyll/document.rb

@@ -266,7 +266,7 @@ module Jekyll
           merge_defaults
           read_content(opts)
           read_post_data
-        rescue SyntaxError, StandardError, Errors::FatalException => e
+        rescue StandardError => e
           handle_read_error(e)
         end
       end
@@ -463,7 +463,7 @@ module Jekyll
 
     private
     def handle_read_error(error)
-      if error.is_a? SyntaxError
+      if error.is_a? Psych::SyntaxError
         Jekyll.logger.error "Error:", "YAML Exception reading #{path}: #{error.message}"
       else
         Jekyll.logger.error "Error:", "could not read file #{path}: #{error.message}"

test/test_convertible.rb

@@ -31,7 +31,7 @@ class TestConvertible < JekyllUnitTest
         ret = @convertible.read_yaml(@base, name)
         assert_equal({}, ret)
       end
-      assert_match(%r!YAML Exception|syntax error|Error reading file!, out)
+      assert_match(%r!YAML Exception!, out)
       assert_match(%r!#{File.join(@base, name)}!, out)
     end