summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2019-09-24 20:59:12 -0700
committerJeremy Evans <code@jeremyevans.net>2019-11-18 01:00:25 +0200
commitffd0820ab317542f8780aac475da590a4bdbc7a8 (patch)
tree6a5d774933c15fd2b9ea948bd3ae2fa587faaf82 /bin
parentc5c05460ac20abcbc0ed686eb4acf06da7a39a79 (diff)
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.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/2476
Diffstat (limited to 'bin')
-rwxr-xr-xbin/erb6
1 files changed, 3 insertions, 3 deletions
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