diff options
author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-02 17:52:33 +0000 |
---|---|---|
committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-02 17:52:33 +0000 |
commit | e859e668d2eb59f34ad18edb7458ce90076617e9 (patch) | |
tree | 0c2866cf07670dbcea797ee96a620e5d761af417 /lib/cgi | |
parent | c8c66bcf92b94951fd2035761f91e6cde3145d7f (diff) | |
download | ruby-e859e668d2eb59f34ad18edb7458ce90076617e9.tar.gz |
lib/*: Prefer require_relative over require.
[#15206] [Fix GH-1976]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cgi')
-rw-r--r-- | lib/cgi/cookie.rb | 2 | ||||
-rw-r--r-- | lib/cgi/core.rb | 10 | ||||
-rw-r--r-- | lib/cgi/session/pstore.rb | 2 | ||||
-rw-r--r-- | lib/cgi/util.rb | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb index a2155edb77..9a0d41e2b8 100644 --- a/lib/cgi/cookie.rb +++ b/lib/cgi/cookie.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'cgi/util' +require_relative 'util' class CGI # Class representing an HTTP cookie. # diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb index 73daae3e17..3fb8dbab54 100644 --- a/lib/cgi/core.rb +++ b/lib/cgi/core.rb @@ -862,24 +862,24 @@ class CGI case @options[:tag_maker] when "html3" - require 'cgi/html' + require_relative 'html' extend Html3 extend HtmlExtension when "html4" - require 'cgi/html' + require_relative 'html' extend Html4 extend HtmlExtension when "html4Tr" - require 'cgi/html' + require_relative 'html' extend Html4Tr extend HtmlExtension when "html4Fr" - require 'cgi/html' + require_relative 'html' extend Html4Tr extend Html4Fr extend HtmlExtension when "html5" - require 'cgi/html' + require_relative 'html' extend Html5 extend HtmlExtension end diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb index cb0370b619..5a6e25d137 100644 --- a/lib/cgi/session/pstore.rb +++ b/lib/cgi/session/pstore.rb @@ -10,7 +10,7 @@ # persistent of session data on top of the pstore library. See # cgi/session.rb for more details on session storage managers. -require 'cgi/session' +require_relative '../session' require 'pstore' class CGI diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb index 464115262f..840bd6d5d0 100644 --- a/lib/cgi/util.rb +++ b/lib/cgi/util.rb @@ -55,7 +55,7 @@ module CGI::Util end begin - require 'cgi/escape' + require_relative 'escape' rescue LoadError end |