From ffd0820ab317542f8780aac475da590a4bdbc7a8 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 24 Sep 2019 20:59:12 -0700 Subject: Deprecate taint/trust and related methods, and make the methods no-ops This removes the related tests, and puts the related specs behind version guards. This affects all code in lib, including some libraries that may want to support older versions of Ruby. --- bin/erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin/erb') diff --git a/bin/erb b/bin/erb index d5e51ee969..2435224fe1 100755 --- a/bin/erb +++ b/bin/erb @@ -128,10 +128,10 @@ EOU exit 2 unless src trim = trim_mode_opt(trim_mode, disable_percent) if safe_level.nil? - erb = factory.new(src.untaint, trim_mode: trim) + erb = factory.new(src, trim_mode: trim) else # [deprecated] This will be removed at Ruby 2.7. - erb = factory.new(src.untaint, safe_level, trim_mode: trim) + erb = factory.new(src, safe_level, trim_mode: trim) end erb.filename = filename if output @@ -143,7 +143,7 @@ EOU puts erb.src end else - bind = TOPLEVEL_BINDING.taint + bind = TOPLEVEL_BINDING if variables enc = erb.encoding for var, val in variables do -- cgit v1.2.3