diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-11 00:20:27 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-11 00:20:27 +0000 |
commit | 6268098208e72af53e94b09c4f1d8b010816c328 (patch) | |
tree | 8ba2b4e8e6a0533806088fab42a25773160a8324 /lib/rubygems/safe_yaml.rb | |
parent | ba8d27e670cb728f476bead115c11066f8242885 (diff) |
Make rubygems follow the upstream of psych
And merge psych again.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/safe_yaml.rb')
-rw-r--r-- | lib/rubygems/safe_yaml.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rubygems/safe_yaml.rb b/lib/rubygems/safe_yaml.rb index d610889995..f3313b33e8 100644 --- a/lib/rubygems/safe_yaml.rb +++ b/lib/rubygems/safe_yaml.rb @@ -7,7 +7,7 @@ module Gem # Psych.safe_load module SafeYAML - WHITELISTED_CLASSES = %w( + PERMITTED_CLASSES = %w( Symbol Time Date @@ -21,7 +21,7 @@ module Gem Syck::DefaultKey ).freeze - WHITELISTED_SYMBOLS = %w( + PERMITTED_SYMBOLS = %w( development runtime ).freeze @@ -29,15 +29,15 @@ module Gem if ::YAML.respond_to? :safe_load def self.safe_load input if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') - ::YAML.safe_load(input, whitelist_classes: WHITELISTED_CLASSES, whitelist_symbols: WHITELISTED_SYMBOLS, aliases: true) + ::YAML.safe_load(input, permitted_classes: PERMITTED_CLASSES, permitted_symbols: PERMITTED_SYMBOLS, aliases: true) else - ::YAML.safe_load(input, WHITELISTED_CLASSES, WHITELISTED_SYMBOLS, true) + ::YAML.safe_load(input, PERMITTED_CLASSES, PERMITTED_SYMBOLS, true) end end def self.load input if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') - ::YAML.safe_load(input, whitelist_classes: [::Symbol]) + ::YAML.safe_load(input, permitted_classes: [::Symbol]) else ::YAML.safe_load(input, [::Symbol]) end |