diff options
author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-22 13:28:25 +0000 |
---|---|---|
committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-22 13:28:25 +0000 |
commit | cc777d09f44fa909a336ba14f3aa802ffe16e010 (patch) | |
tree | f360ca1bfed187f981397f6c7370360287606ffb /lib/rdoc | |
parent | 1727c8358498054428a376b52869983549f62399 (diff) |
erb.rb: deprecate safe_level of ERB.new
Also, as it's in the middle of the list of 4 arguments, 3rd and 4th arguments
(trim_mode, eoutvar) are changed to keyword arguments.
Old ways to specify arguments are deprecated and warned now.
bin/erb: deprecate -S option.
We'll remove all of deprecated ones at Ruby 2.7+.
enc/make_encmake.rb: stopped using deprecated interface
ext/etc/mkconstants.rb: ditto
ext/socket/mkconstants.rb: ditto
sample/ripper/ruby2html.rb: ditto
spec/ruby/library/erb/defmethod/def_erb_method_spec.rb: ditto
spec/ruby/library/erb/new_spec.rb: ditto
test/erb/test_erb.rb: ditto
test/erb/test_erb_command.rb: ditto
tool/generic_erb.rb: ditto
tool/ruby_vm/helpers/dumper.rb: ditto
tool/transcode-tblgen.rb: ditto
lib/rdoc/erbio.rb: ditto
lib/rdoc/generator/darkfish.rb: ditto
[Feature #14256]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r-- | lib/rdoc/erbio.rb | 6 | ||||
-rw-r--r-- | lib/rdoc/generator/darkfish.rb | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/rdoc/erbio.rb b/lib/rdoc/erbio.rb index 42ce895fb3..2ebce9519f 100644 --- a/lib/rdoc/erbio.rb +++ b/lib/rdoc/erbio.rb @@ -21,7 +21,11 @@ class RDoc::ERBIO < ERB # Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize def initialize str, safe_level = nil, trim_mode = nil, eoutvar = 'io' - super + if RUBY_VERSION >= '2.6' + super(str, trim_mode: trim_mode, eoutvar: eoutvar) + else + super + end end ## diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb index bf4eb1f530..a07f74e716 100644 --- a/lib/rdoc/generator/darkfish.rb +++ b/lib/rdoc/generator/darkfish.rb @@ -778,7 +778,11 @@ class RDoc::Generator::Darkfish erbout = "_erbout_#{file_var}" end - template = klass.new template, nil, '<>', erbout + if RUBY_VERSION >= '2.6' + template = klass.new template, trim_mode: '<>', eoutvar: erbout + else + template = klass.new template, nil, '<>', erbout + end @template_cache[file] = template template end |