summaryrefslogtreecommitdiff
path: root/lib/psych.rb
diff options
context:
space:
mode:
authorSHIBATA Hiroshi <hsbt@ruby-lang.org>2017-12-19 17:34:52 +0900
committerGitHub <noreply@github.com>2017-12-19 17:34:52 +0900
commite90cceab21cccaa41ee742773ea18af5a11cc146 (patch)
tree5ca81162fa81e1ca81c1cae98d57acfa0adf08e1 /lib/psych.rb
parent6333cf8cc365b644fbffd8b122f2e720f5654e77 (diff)
parent5db58be1bfa1393dbf087d972465b61b3d6baa31 (diff)
downloadpsych-e90cceab21cccaa41ee742773ea18af5a11cc146.zip
Merge pull request #342 from stomar/fallback-keyword
Convert fallback option to a keyword argument
Diffstat (limited to 'lib/psych.rb')
-rw-r--r--lib/psych.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/psych.rb b/lib/psych.rb
index aea3565..a4d5a96 100644
--- a/lib/psych.rb
+++ b/lib/psych.rb
@@ -259,8 +259,8 @@ module Psych
# Psych.load("---\n foo: bar") # => {"foo"=>"bar"}
# Psych.load("---\n foo: bar", symbolize_names: true) # => {:foo=>"bar"}
#
- def self.load yaml, filename = nil, fallback = false, symbolize_names: false
- result = parse(yaml, filename, fallback)
+ def self.load yaml, filename = nil, fallback: false, symbolize_names: false
+ result = parse(yaml, filename, fallback: fallback)
result = result.to_ruby if result
symbolize_names!(result) if symbolize_names
result
@@ -346,7 +346,7 @@ module Psych
# end
#
# See Psych::Nodes for more information about YAML AST.
- def self.parse yaml, filename = nil, fallback = false
+ def self.parse yaml, filename = nil, fallback: false
parse_stream(yaml, filename) do |node|
return node
end
@@ -493,9 +493,9 @@ module Psych
# Load the document contained in +filename+. Returns the yaml contained in
# +filename+ as a Ruby object, or if the file is empty, it returns
# the specified default return value, which defaults to an empty Hash
- def self.load_file filename, fallback = false
+ def self.load_file filename, fallback: false
File.open(filename, 'r:bom|utf-8') { |f|
- self.load f, filename, FALLBACK.new(fallback)
+ self.load f, filename, fallback: FALLBACK.new(fallback)
}
end