Merge psych-3.0.2 from ruby/psych.

It version changed fallback option to keywoad argument
  on `Yaml.load` method. It break backword compatiblity.

  see detailed discuttion: https://github.com/ruby/psych/issues/340

From: SHIBATA Hiroshi <hsbt@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2017-12-19 09:44:33 +00:00
parent 373babeaac
commit def7fab871
4 changed files with 20 additions and 10 deletions

View file

@ -146,7 +146,7 @@ class TestPsych < Psych::TestCase
def test_load_file_with_fallback
Tempfile.create(['empty', 'yml']) {|t|
assert_equal Hash.new, Psych.load_file(t.path, Hash.new)
assert_equal Hash.new, Psych.load_file(t.path, fallback: Hash.new)
}
end