1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle to look up CGI::EscapeExt instead of using LoadError. cgi/escape is provided snce Ruby 2.3

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2025-05-13 13:29:16 +09:00
parent c40557099d
commit 4d9a1d5b6f
Notes: git 2025-05-13 05:37:37 +00:00 
Merged: https://github.com/ruby/ruby/pull/13311
7 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/bundler/fetcher/dependency.rb
View File

@ -1,11 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
require_relative "base" require_relative "base"
begin require "cgi/escape"
require "cgi/escape" require "cgi/util" unless defined?(CGI::EscapeExt)
rescue LoadError
require "cgi/util"
end
module Bundler module Bundler
class Fetcher class Fetcher

5
lib/bundler/friendly_errors.rb
View File

@ -102,11 +102,8 @@ module Bundler
def issues_url(exception) def issues_url(exception)
message = exception.message.lines.first.tr(":", " ").chomp message = exception.message.lines.first.tr(":", " ").chomp
message = message.split("-").first if exception.is_a?(Errno) message = message.split("-").first if exception.is_a?(Errno)
begin
require "cgi/escape" require "cgi/escape"
rescue LoadError require "cgi/util" unless defined?(CGI::EscapeExt)
require "cgi/util"
end
"https://github.com/rubygems/rubygems/search?q=" \ "https://github.com/rubygems/rubygems/search?q=" \
"#{CGI.escape(message)}&type=Issues" "#{CGI.escape(message)}&type=Issues"
end end

7
lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb vendored
View File

@ -1,10 +1,7 @@
require_relative '../../../../../vendored_net_http' require_relative '../../../../../vendored_net_http'
require_relative '../../../../../vendored_uri' require_relative '../../../../../vendored_uri'
begin require 'cgi/escape'
require 'cgi/escape' require 'cgi/util' unless defined?(CGI::EscapeExt)
rescue LoadError
require 'cgi/util' # for escaping
end
require_relative '../../../../connection_pool/lib/connection_pool' require_relative '../../../../connection_pool/lib/connection_pool'
autoload :OpenSSL, 'openssl' autoload :OpenSSL, 'openssl'

7
lib/net/http.rb
View File

@ -1917,11 +1917,8 @@ module Net #:nodoc:
private private
def unescape(value) def unescape(value)
begin require 'cgi/escape'
require "cgi/escape" require 'cgi/util' unless defined?(CGI::EscapeExt)
rescue LoadError
require "cgi/util"
end
CGI.unescape(value) CGI.unescape(value)
end end

5
lib/rubygems/uri_formatter.rb
View File

@ -17,11 +17,8 @@ class Gem::UriFormatter
# Creates a new URI formatter for +uri+. # Creates a new URI formatter for +uri+.
def initialize(uri) def initialize(uri)
begin
require "cgi/escape" require "cgi/escape"
rescue LoadError require "cgi/util" unless defined?(CGI::EscapeExt)
require "cgi/util"
end
@uri = uri @uri = uri
end end

7
lib/rubygems/vendor/net-http/lib/net/http.rb vendored
View File

@ -1923,11 +1923,8 @@ module Gem::Net #:nodoc:
private private
def unescape(value) def unescape(value)
begin require 'cgi/escape'
require "cgi/escape" require 'cgi/util' unless defined?(CGI::EscapeExt)
rescue LoadError
require "cgi/util"
end
CGI.unescape(value) CGI.unescape(value)
end end

7
prism/templates/lib/prism/dot_visitor.rb.erb
View File

@ -1,8 +1,5 @@
begin require "cgi/escape"
require "cgi/escape" require "cgi/util" unless defined?(CGI::EscapeExt)
rescue LoadError
require "cgi/util"
end
module Prism module Prism
# This visitor provides the ability to call Node#to_dot, which converts a # This visitor provides the ability to call Node#to_dot, which converts a