kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

erb.rb: print deprecation warning with warn level 1

Browse source 
This was planned to be removed in Ruby 2.7 at first, but I changed my
mind to just keep warning it in Ruby 2.7.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-12-25 13:57:28 +00:00
parent 3a0471faa0
commit b5569b9ab2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/erb.rb
View file

@ -812,18 +812,18 @@ class ERB
# A well messages pattie, breaded and fried.
#
def initialize(str, safe_level=NOT_GIVEN, legacy_trim_mode=NOT_GIVEN, legacy_eoutvar=NOT_GIVEN, trim_mode: nil, eoutvar: '_erbout')
# Complex initializer for $SAFE deprecation at Feature #14256, which should be removed at Ruby 2.7.
# Complex initializer for $SAFE deprecation at [Feature #14256], which should be removed at a version later than 2.7.
if safe_level != NOT_GIVEN
warn 'Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments.', uplevel: 1 if $VERBOSE
warn 'Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments.', uplevel: 1
else
safe_level = nil
end
if legacy_trim_mode != NOT_GIVEN
warn 'Passing trim_mode with the 3rd argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, trim_mode: ...) instead.', uplevel: 1 if $VERBOSE
warn 'Passing trim_mode with the 3rd argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, trim_mode: ...) instead.', uplevel: 1
trim_mode = legacy_trim_mode
end
if legacy_eoutvar != NOT_GIVEN
warn 'Passing eoutvar with the 4th argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, eoutvar: ...) instead.', uplevel: 1 if $VERBOSE
warn 'Passing eoutvar with the 4th argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, eoutvar: ...) instead.', uplevel: 1
eoutvar = legacy_eoutvar
end

8
test/erb/test_erb.rb
View file

@ -24,7 +24,7 @@ class TestERB < Test::Unit::TestCase
assert_match(/\Atest filename:1\b/, e.backtrace[0])
end
# [deprecated] This will be removed at Ruby 2.7
# [deprecated] This will be removed later than Ruby 2.7
def test_without_filename_with_safe_level
erb = EnvUtil.suppress_warning do
ERB.new("<% raise ::TestERB::MyError %>", 1)
@ -35,7 +35,7 @@ class TestERB < Test::Unit::TestCase
assert_match(/\A\(erb\):1\b/, e.backtrace[0])
end
# [deprecated] This will be removed at Ruby 2.7
# [deprecated] This will be removed later than Ruby 2.7
def test_with_filename_and_safe_level
erb = EnvUtil.suppress_warning do
ERB.new("<% raise ::TestERB::MyError %>", 1)
@ -98,7 +98,7 @@ class TestERBCore < Test::Unit::TestCase
end
def test_core
# [deprecated] Fix initializer at Ruby 2.7
# [deprecated] Fix initializer later than Ruby 2.7
EnvUtil.suppress_warning do
_test_core(nil)
_test_core(0)
@ -661,7 +661,7 @@ EOS
end
end
# These interfaces will be removed at Ruby 2.7.
# These interfaces will be removed later than Ruby 2.7.
def test_deprecated_interface_warnings
[nil, 0, 1, 2].each do |safe|
assert_warning(/2nd argument of ERB.new is deprecated/) do