ruby-changes:53292
From: marcandre <ko1@a...>
Date: Sat, 3 Nov 2018 03:10:33 +0900 (JST)
Subject: [ruby-changes:53292] marcandRe: r65505 (trunk): lib/*: Prefer require_relative over require.
marcandre 2018-11-03 02:52:33 +0900 (Sat, 03 Nov 2018) New Revision: 65505 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65505 Log: lib/*: Prefer require_relative over require. [#15206] [Fix GH-1976] Modified files: trunk/lib/cgi/cookie.rb trunk/lib/cgi/core.rb trunk/lib/cgi/session/pstore.rb trunk/lib/cgi/util.rb trunk/lib/drb/drb.rb trunk/lib/drb/extserv.rb trunk/lib/drb/extservm.rb trunk/lib/drb/gw.rb trunk/lib/drb/ssl.rb trunk/lib/drb/timeridconv.rb trunk/lib/drb/unix.rb trunk/lib/irb/cmd/load.rb trunk/lib/irb/context.rb trunk/lib/irb/ext/use-loader.rb trunk/lib/irb/init.rb trunk/lib/irb/input-method.rb trunk/lib/irb/ruby-lex.rb trunk/lib/irb/slex.rb trunk/lib/irb/xmp.rb trunk/lib/net/ftp.rb trunk/lib/net/http/status.rb trunk/lib/net/https.rb trunk/lib/net/imap.rb trunk/lib/net/pop.rb trunk/lib/net/smtp.rb trunk/lib/racc/parser.rb trunk/lib/rexml/attlistdecl.rb trunk/lib/rexml/attribute.rb trunk/lib/rexml/cdata.rb trunk/lib/rexml/child.rb trunk/lib/rexml/comment.rb trunk/lib/rexml/doctype.rb trunk/lib/rexml/document.rb trunk/lib/rexml/dtd/attlistdecl.rb trunk/lib/rexml/dtd/dtd.rb trunk/lib/rexml/dtd/elementdecl.rb trunk/lib/rexml/dtd/entitydecl.rb trunk/lib/rexml/dtd/notationdecl.rb trunk/lib/rexml/element.rb trunk/lib/rexml/entity.rb trunk/lib/rexml/formatters/pretty.rb trunk/lib/rexml/formatters/transitive.rb trunk/lib/rexml/instruction.rb trunk/lib/rexml/light/node.rb trunk/lib/rexml/namespace.rb trunk/lib/rexml/node.rb trunk/lib/rexml/output.rb trunk/lib/rexml/parent.rb trunk/lib/rexml/parsers/baseparser.rb trunk/lib/rexml/parsers/lightparser.rb trunk/lib/rexml/parsers/pullparser.rb trunk/lib/rexml/parsers/sax2parser.rb trunk/lib/rexml/parsers/streamparser.rb trunk/lib/rexml/parsers/treeparser.rb trunk/lib/rexml/parsers/ultralightparser.rb trunk/lib/rexml/parsers/xpathparser.rb trunk/lib/rexml/quickpath.rb trunk/lib/rexml/source.rb trunk/lib/rexml/text.rb trunk/lib/rexml/undefinednamespaceexception.rb trunk/lib/rexml/validation/relaxng.rb trunk/lib/rexml/validation/validation.rb trunk/lib/rexml/xmldecl.rb trunk/lib/rexml/xpath.rb trunk/lib/rexml/xpath_parser.rb trunk/lib/rinda/ring.rb trunk/lib/rinda/tuplespace.rb trunk/lib/rss/0.9.rb trunk/lib/rss/1.0.rb trunk/lib/rss/atom.rb trunk/lib/rss/content.rb trunk/lib/rss/converter.rb trunk/lib/rss/dublincore/atom.rb trunk/lib/rss/dublincore.rb trunk/lib/rss/image.rb trunk/lib/rss/maker/0.9.rb trunk/lib/rss/maker/1.0.rb trunk/lib/rss/maker/atom.rb trunk/lib/rss/maker/base.rb trunk/lib/rss/maker/content.rb trunk/lib/rss/maker/dublincore.rb trunk/lib/rss/maker/entry.rb trunk/lib/rss/maker/feed.rb trunk/lib/rss/maker/image.rb trunk/lib/rss/maker/itunes.rb trunk/lib/rss/maker/slash.rb trunk/lib/rss/maker/syndication.rb trunk/lib/rss/maker/taxonomy.rb trunk/lib/rss/maker/trackback.rb trunk/lib/rss/maker.rb trunk/lib/rss/parser.rb trunk/lib/rss/rss.rb trunk/lib/rss/taxonomy.rb trunk/lib/rss/xml-stylesheet.rb trunk/lib/rss/xml.rb trunk/lib/shell/builtin-command.rb trunk/lib/shell/command-processor.rb trunk/lib/shell/system-command.rb trunk/lib/uri/common.rb trunk/lib/uri/file.rb trunk/lib/uri/ftp.rb trunk/lib/uri/generic.rb trunk/lib/uri/http.rb trunk/lib/uri/https.rb trunk/lib/uri/ldap.rb trunk/lib/uri/ldaps.rb trunk/lib/uri/mailto.rb trunk/lib/webrick/cgi.rb trunk/lib/webrick/config.rb trunk/lib/webrick/cookie.rb trunk/lib/webrick/httpauth/basicauth.rb trunk/lib/webrick/httpauth/digestauth.rb trunk/lib/webrick/httpauth/htdigest.rb trunk/lib/webrick/httpauth/htpasswd.rb trunk/lib/webrick/httpauth.rb trunk/lib/webrick/httpproxy.rb trunk/lib/webrick/httprequest.rb trunk/lib/webrick/httpresponse.rb trunk/lib/webrick/https.rb trunk/lib/webrick/httpserver.rb trunk/lib/webrick/httpservlet/abstract.rb trunk/lib/webrick/httpservlet/cgihandler.rb trunk/lib/webrick/httpservlet/filehandler.rb trunk/lib/webrick/httpservlet.rb trunk/lib/webrick/httpstatus.rb trunk/lib/webrick/server.rb Index: lib/webrick/httpproxy.rb =================================================================== --- lib/webrick/httpproxy.rb (revision 65504) +++ lib/webrick/httpproxy.rb (revision 65505) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpproxy.rb#L10 # $IPR: httpproxy.rb,v 1.18 2003/03/08 18:58:10 gotoyuzo Exp $ # $kNotwork: straw.rb,v 1.3 2002/02/12 15:13:07 gotoken Exp $ -require "webrick/httpserver" +require_relative "httpserver" require "net/http" module WEBrick Index: lib/webrick/httpservlet/filehandler.rb =================================================================== --- lib/webrick/httpservlet/filehandler.rb (revision 65504) +++ lib/webrick/httpservlet/filehandler.rb (revision 65505) @@ -11,9 +11,9 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpservlet/filehandler.rb#L11 require 'time' -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative '../htmlutils' +require_relative '../httputils' +require_relative '../httpstatus' module WEBrick module HTTPServlet Index: lib/webrick/httpservlet/cgihandler.rb =================================================================== --- lib/webrick/httpservlet/cgihandler.rb (revision 65504) +++ lib/webrick/httpservlet/cgihandler.rb (revision 65505) @@ -11,8 +11,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpservlet/cgihandler.rb#L11 require 'rbconfig' require 'tempfile' -require 'webrick/config' -require 'webrick/httpservlet/abstract' +require_relative '../config' +require_relative 'abstract' module WEBrick module HTTPServlet Index: lib/webrick/httpservlet/abstract.rb =================================================================== --- lib/webrick/httpservlet/abstract.rb (revision 65504) +++ lib/webrick/httpservlet/abstract.rb (revision 65505) @@ -9,9 +9,9 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpservlet/abstract.rb#L9 # # $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $ -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative '../htmlutils' +require_relative '../httputils' +require_relative '../httpstatus' module WEBrick module HTTPServlet Index: lib/webrick/httpstatus.rb =================================================================== --- lib/webrick/httpstatus.rb (revision 65504) +++ lib/webrick/httpstatus.rb (revision 65505) @@ -9,7 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpstatus.rb#L9 # # $IPR: httpstatus.rb,v 1.11 2003/03/24 20:18:55 gotoyuzo Exp $ -require 'webrick/accesslog' +require_relative 'accesslog' module WEBrick Index: lib/webrick/httpservlet.rb =================================================================== --- lib/webrick/httpservlet.rb (revision 65504) +++ lib/webrick/httpservlet.rb (revision 65505) @@ -9,11 +9,11 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpservlet.rb#L9 # # $IPR: httpservlet.rb,v 1.21 2003/02/23 12:24:46 gotoyuzo Exp $ -require 'webrick/httpservlet/abstract' -require 'webrick/httpservlet/filehandler' -require 'webrick/httpservlet/cgihandler' -require 'webrick/httpservlet/erbhandler' -require 'webrick/httpservlet/prochandler' +require_relative 'httpservlet/abstract' +require_relative 'httpservlet/filehandler' +require_relative 'httpservlet/cgihandler' +require_relative 'httpservlet/erbhandler' +require_relative 'httpservlet/prochandler' module WEBrick module HTTPServlet Index: lib/webrick/httprequest.rb =================================================================== --- lib/webrick/httprequest.rb (revision 65504) +++ lib/webrick/httprequest.rb (revision 65505) @@ -10,10 +10,10 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httprequest.rb#L10 # $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $ require 'uri' -require 'webrick/httpversion' -require 'webrick/httpstatus' -require 'webrick/httputils' -require 'webrick/cookie' +require_relative 'httpversion' +require_relative 'httpstatus' +require_relative 'httputils' +require_relative 'cookie' module WEBrick Index: lib/webrick/httpresponse.rb =================================================================== --- lib/webrick/httpresponse.rb (revision 65504) +++ lib/webrick/httpresponse.rb (revision 65505) @@ -11,10 +11,10 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpresponse.rb#L11 require 'time' require 'uri' -require 'webrick/httpversion' -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative 'httpversion' +require_relative 'htmlutils' +require_relative 'httputils' +require_relative 'httpstatus' module WEBrick ## Index: lib/webrick/httpauth/digestauth.rb =================================================================== --- lib/webrick/httpauth/digestauth.rb (revision 65504) +++ lib/webrick/httpauth/digestauth.rb (revision 65505) @@ -12,9 +12,9 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpauth/digestauth.rb#L12 # # $IPR: digestauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $ -require 'webrick/config' -require 'webrick/httpstatus' -require 'webrick/httpauth/authenticator' +require_relative '../config' +require_relative '../httpstatus' +require_relative 'authenticator' require 'digest/md5' require 'digest/sha1' Index: lib/webrick/httpauth/basicauth.rb =================================================================== --- lib/webrick/httpauth/basicauth.rb (revision 65504) +++ lib/webrick/httpauth/basicauth.rb (revision 65505) @@ -8,9 +8,9 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpauth/basicauth.rb#L8 # # $IPR: basicauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $ -require 'webrick/config' -require 'webrick/httpstatus' -require 'webrick/httpauth/authenticator' +require_relative '../config' +require_relative '../httpstatus' +require_relative 'authenticator' module WEBrick module HTTPAuth Index: lib/webrick/httpauth/htdigest.rb =================================================================== --- lib/webrick/httpauth/htdigest.rb (revision 65504) +++ lib/webrick/httpauth/htdigest.rb (revision 65505) @@ -8,8 +8,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpauth/htdigest.rb#L8 # # $IPR: htdigest.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $ -require 'webrick/httpauth/userdb' -require 'webrick/httpauth/digestauth' +require_relative 'userdb' +require_relative 'digestauth' require 'tempfile' module WEBrick Index: lib/webrick/httpauth/htpasswd.rb =================================================================== --- lib/webrick/httpauth/htpasswd.rb (revision 65504) +++ lib/webrick/httpauth/htpasswd.rb (revision 65505) @@ -8,8 +8,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpauth/htpasswd.rb#L8 # # $IPR: htpasswd.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $ -require 'webrick/httpauth/userdb' -require 'webrick/httpauth/basicauth' +require_relative 'userdb' +require_relative 'basicauth' require 'tempfile' module WEBrick Index: lib/webrick/httpauth.rb =================================================================== --- lib/webrick/httpauth.rb (revision 65504) +++ lib/webrick/httpauth.rb (revision 65505) @@ -9,11 +9,11 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpauth.rb#L9 # # $IPR: httpauth.rb,v 1.14 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/httpauth/basicauth' -require 'webrick/httpauth/digestauth' -require 'webrick/httpauth/htpasswd' -require 'webrick/httpauth/htdigest' -require 'webrick/httpauth/htgroup' +require_relative 'httpauth/basicauth' +require_relative 'httpauth/digestauth' +require_relative 'httpauth/htpasswd' +require_relative 'httpauth/htdigest' +require_relative 'httpauth/htgroup' module WEBrick Index: lib/webrick/https.rb =================================================================== --- lib/webrick/https.rb (revision 65504) +++ lib/webrick/https.rb (revision 65505) @@ -9,8 +9,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/https.rb#L9 # # $IPR: https.rb,v 1.15 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/ssl' -require 'webrick/httpserver' +require_relative 'ssl' +require_relative 'httpserver' module WEBrick module Config Index: lib/webrick/cgi.rb =================================================================== --- lib/webrick/cgi.rb (revision 65504) +++ lib/webrick/cgi.rb (revision 65505) @@ -8,9 +8,9 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/cgi.rb#L8 # # $Id$ -require "webrick/httprequest" -require "webrick/httpresponse" -require "webrick/config" +require_relative "httprequest" +require_relative "httpresponse" +require_relative "config" require "stringio" module WEBrick Index: lib/webrick/config.rb =================================================================== --- lib/webrick/config.rb (revision 65504) +++ lib/webrick/config.rb (revision 65505) @@ -9,11 +9,11 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/config.rb#L9 # # $IPR: config.rb,v 1.52 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/version' -require 'webrick/httpversion' -require 'webrick/httputils' -require 'webrick/utils' -require 'webrick/log' +require_relative 'version' +require_relative 'httpversion' +require_relative 'httputils' +require_relative 'utils' +require_relative 'log' module WEBrick module Config Index: lib/webrick/httpserver.rb =================================================================== --- lib/webrick/httpserver.rb (revision 65504) +++ lib/webrick/httpserver.rb (revision 65505) @@ -10,13 +10,13 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpserver.rb#L10 # $IPR: httpserver.rb,v 1.63 2002/10/01 17:16:32 gotoyuzo Exp $ require 'io/wait' -require 'webrick/server' -require 'webrick/httputils' -require 'webrick/httpstatus' -require 'webrick/httprequest' -require 'webrick/httpresponse' -require 'webrick/httpservlet' -require 'webrick/accesslog' +require_relative 'server' +require_relative 'httputils' +require_relative 'httpstatus' +require_relative 'httprequest' +require_relative 'httpresponse' +require_relative 'httpservlet' +require_relative 'accesslog' module WEBrick class HTTPServerError < ServerError; end Index: lib/webrick/server.rb =================================================================== --- lib/webrick/server.rb (revision 65504) +++ lib/webrick/server.rb (revision 65505) @@ -10,8 +10,8 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/server.rb#L10 # $IPR: server.rb,v 1.62 2003/07/22 19:20:43 gotoyuzo Exp $ require 'socket' -require 'webrick/config' -require 'webrick/log' +require_relative 'config' +require_relative 'log' module WEBrick Index: lib/webrick/cookie.rb =================================================================== --- lib/webrick/cookie.rb (revision 65504) +++ lib/webrick/cookie.rb (revision 65505) @@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/webrick/cookie.rb#L10 # $IPR: cookie.rb,v 1.16 2002/09/21 12:23:35 gotoyuzo Exp $ require 'time' -require 'webrick/httputils' +require_relative 'httputils' module WEBrick Index: lib/rexml/validation/validation.rb =================================================================== --- lib/rexml/validation/validation.rb (revision 65504) +++ lib/rexml/validation/validation.rb (revision 65505) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/validation/validation.rb#L1 # frozen_string_literal: false -require 'rexml/validation/validationexception' +require_relative 'validationexception' module REXML module Validation Index: lib/rexml/validation/relaxng.rb =================================================================== --- lib/rexml/validation/relaxng.rb (revision 65504) +++ lib/rexml/validation/relaxng.rb (revision 65505) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/validation/relaxng.rb#L1 # frozen_string_literal: false -require "rexml/validation/validation" -require "rexml/parsers/baseparser" +require_relative "validation" +require_relative "../parsers/baseparser" module REXML module Validation Index: lib/rexml/xmldecl.rb =================================================================== --- lib/rexml/xmldecl.rb (revision 65504) +++ lib/rexml/xmldecl.rb (revision 65505) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/xmldecl.rb#L1 # frozen_string_literal: false -require 'rexml/encoding' -require 'rexml/source' +require_relative 'encoding' +require_relative 'source' module REXML # NEEDS DOCUMENTATION Index: lib/rexml/quickpath.rb =================================================================== --- lib/rexml/quickpath.rb (revision 65504) +++ lib/rexml/quickpath.rb (revision 65505) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/quickpath.rb#L1 # frozen_string_literal: false -require 'rexml/functions' -require 'rexml/xmltokens' +require_relative 'functions' +require_relative 'xmltokens' module REXML class QuickPath Index: lib/rexml/parent.rb =================================================================== --- lib/rexml/parent.rb (revision 65504) +++ lib/rexml/parent.rb (revision 65505) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/parent.rb#L1 # frozen_string_literal: false -require "rexml/child" +require_relative "child" module REXML # A parent has children, and has methods for accessing them. The Parent Index: lib/rexml/element.rb =================================================================== --- lib/rexml/element.rb (revision 65504) +++ lib/rexml/element.rb (revision 65505) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/element.rb#L1 # frozen_string_literal: false -require "rexml/parent" -require "rexml/namespace" -require "rexml/attribute" -require "rexml/cdata" -require "rexml/xpath" -require "rexml/parseexception" +require_relative "parent" +require_relative "namespace" +require_relative "attribute" +require_relative "cdata" +require_relative "xpath" +require_relative "parseexception" module REXML # An implementation note about namespaces: @@ -713,7 +713,7 @@ module REXML https://github.com/ruby/ruby/blob/trunk/lib/rexml/element.rb#L713 Kernel.warn("#{self.class.name}.write is deprecated. See REXML::Formatters", uplevel: 1) formatter = if indent > -1 if transitive - require "rexml/formatters/transitive" + require_relative "formatters/transitive" REXML::Formatters::Transitive.new( indent, ie_hack ) else REXML::Formatters::Pretty.new( indent, ie_hack ) Index: lib/rexml/source.rb =================================================================== --- lib/rexml/source.rb (revision 65504) +++ lib/rexml/source.rb (revision 65505) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/source.rb#L1 # coding: US-ASCII # frozen_string_literal: false -require 'rexml/encoding' +require_relative 'encoding' module REXML # Generates Source-s. USE THIS CLASS. Index: lib/rexml/comment.rb =================================================================== --- lib/rexml/comment.rb (revision 65504) +++ lib/rexml/comment.rb (revision 65505) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/comment.rb#L1 # frozen_string_literal: false -require "rexml/child" +require_relative "child" module REXML ## Index: lib/rexml/doctype.rb =================================================================== --- lib/rexml/doctype.rb (revision 65504) +++ lib/rexml/doctype.rb (revision 65505) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/doctype.rb#L1 # frozen_string_literal: false -require "rexml/parent" -require "rexml/parseexception" -require "rexml/namespace" -require 'rexml/entity' -require 'rexml/attlistdecl' -require 'rexml/xmltokens' +require_relative "parent" +require_relative "parseexception" +require_relative "namespace" +require_relative 'entity' +require_relative 'attlistdecl' +require_relative 'xmltokens' module REXML # Represents an XML DOCTYPE declaration; that is, the contents of <!DOCTYPE Index: lib/rexml/cdata.rb =================================================================== --- lib/rexml/cdata.rb (revision 65504) +++ lib/rexml/cdata.rb (revision 65505) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/cdata.rb#L1 # frozen_string_literal: false -require "rexml/text" +require_relative "text" module REXML class CData < Text Index: lib/rexml/text.rb =================================================================== --- lib/rexml/text.rb (revision 65504) +++ lib/rexml/text.rb (revision 65505) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/text.rb#L1 # frozen_string_literal: false -require 'rexml/security' -require 'rexml/entity' -require 'rexml/doctype' -require 'rexml/child' -require 'rexml/doctype' -require 'rexml/parseexception' +require_relative 'security' +require_relative 'entity' +require_relative 'doctype' +require_relative 'child' +require_relative 'doctype' +require_relative 'parseexception' module REXML # Represents text nodes in an XML document Index: lib/rexml/xpath_parser.rb =================================================================== --- lib/rexml/xpath_parser.rb (revision 65504) +++ lib/rexml/xpath_parser.rb (revision 65505) @@ -1,9 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/xpath_parser.rb#L1 # frozen_string_literal: false -require 'rexml/namespace' -require 'rexml/xmltokens' -require 'rexml/attribute' -require 'rexml/syncenumerator' -require 'rexml/parsers/xpathparser' +require_relative 'namespace' +require_relative 'xmltokens' +require_relative 'attribute' +require_relative 'syncenumerator' +require_relative 'parsers/xpathparser' class Object # provides a unified +clone+ operation, for REXML::XPathParser Index: lib/rexml/dtd/attlistdecl.rb =================================================================== --- lib/rexml/dtd/attlistdecl.rb (revision 65504) +++ lib/rexml/dtd/attlistdecl.rb (revision 65505) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/dtd/attlistdecl.rb#L1 # frozen_string_literal: false -require "rexml/child" +require_relative "../child" module REXML module DTD class AttlistDecl < Child Index: lib/rexml/dtd/entitydecl.rb =================================================================== --- lib/rexml/dtd/entitydecl.rb (revision 65504) +++ lib/rexml/dtd/entitydecl.rb (revision 65505) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/dtd/entitydecl.rb#L1 # frozen_string_literal: false -require "rexml/child" +require_relative "../child" module REXML module DTD class EntityDecl < Child Index: lib/rexml/formatters/transitive.rb =================================================================== --- lib/rexml/formatters/transitive.rb (revision 65504) +++ lib/rexml/formatters/transitive.rb (revision 65505) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/formatters/transitive.rb#L1 # frozen_string_literal: false -require 'rexml/formatters/pretty' +require_relative 'pretty' module REXML module Formatters Index: lib/rexml/namespace.rb =================================================================== --- lib/rexml/namespace.rb (revision 65504) +++ lib/rexml/namespace.rb (revision 65505) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/namespace.rb#L1 # frozen_string_literal: false -require 'rexml/xmltokens' +require_relative 'xmltokens' module REXML # Adds named attributes to an object. Index: lib/rexml/dtd/dtd.rb =================================================================== --- lib/rexml/dtd/dtd.rb (revision 65504) +++ lib/rexml/dtd/dtd.rb (revision 65505) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/lib/rexml/dtd/dtd.rb#L1 # frozen_string_literal: false -require "rexml/dtd/elementdecl" -require "rexml/dtd/entitydecl" -require "rexml/ (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/