diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-12 11:56:25 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-12 11:56:25 +0000 |
commit | f2a91397fd7f9ca5bb3d296ec6df2de6f9cfc7cb (patch) | |
tree | eac0f28e2e8c5940a6c0212c059e0dd11185499e /lib/net | |
parent | 0d7718896cfb629ad823b9ca5004465ef2063ab8 (diff) |
Add uplevel keyword to Kernel#warn and use it
If uplevel keyword is given, the warning message is prepended
with caller file and line information and the string "warning: ".
The use of the uplevel keyword makes Kernel#warn format output
similar to how rb_warn formats output.
This patch modifies net/ftp and net/imap to use Kernel#warn
instead of $stderr.puts or $stderr.printf, since they are used
for printing warnings.
This makes lib/cgi/core and tempfile use $stderr.puts instead of
warn for debug logging, since they are used for debug printing
and not for warning.
This does not modify bundler, rubygems, or rdoc, as those are
maintained outside of ruby and probably wish to remain backwards
compatible with older ruby versions.
rb_warn_m code is originally from nobu, but I've changed it
so that it only includes the path and lineno from uplevel
(not the method), and also prepends the string "warning: ",
to make it more similar to rb_warn.
From: Jeremy Evans code@jeremyevans.net
Signed-off-by: Urabe Shyouhei shyouhei@ruby-lang.org
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r-- | lib/net/ftp.rb | 4 | ||||
-rw-r--r-- | lib/net/http.rb | 2 | ||||
-rw-r--r-- | lib/net/http/generic_request.rb | 4 | ||||
-rw-r--r-- | lib/net/http/header.rb | 4 | ||||
-rw-r--r-- | lib/net/http/response.rb | 6 | ||||
-rw-r--r-- | lib/net/imap.rb | 12 |
6 files changed, 14 insertions, 18 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index cfd72ee4e0..a7915189bd 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -310,13 +310,13 @@ module Net # Obsolete def return_code # :nodoc: - $stderr.puts("warning: Net::FTP#return_code is obsolete and do nothing") + warn("Net::FTP#return_code is obsolete and do nothing", uplevel: 1) return "\n" end # Obsolete def return_code=(s) # :nodoc: - $stderr.puts("warning: Net::FTP#return_code= is obsolete and do nothing") + warn("Net::FTP#return_code= is obsolete and do nothing", uplevel: 1) end # Constructs a socket with +host+ and +port+. diff --git a/lib/net/http.rb b/lib/net/http.rb index 6aa3839011..c2d33018a2 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -708,7 +708,7 @@ module Net #:nodoc: # http.start { .... } # def set_debug_output(output) - warn 'Net::HTTP#set_debug_output called after HTTP started' if started? + warn 'Net::HTTP#set_debug_output called after HTTP started', uplevel: 1 if started? @debug_output = output end diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb index 6c5ceafe61..526cc333fc 100644 --- a/lib/net/http/generic_request.rb +++ b/lib/net/http/generic_request.rb @@ -82,7 +82,7 @@ class Net::HTTPGenericRequest end def body_exist? - warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?" if $VERBOSE + warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?", uplevel: 1 if $VERBOSE response_body_permitted? end @@ -299,7 +299,7 @@ class Net::HTTPGenericRequest def supply_default_content_type return if content_type() - warn 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE + warn 'net/http: Content-Type did not set; using application/x-www-form-urlencoded', uplevel: 1 if $VERBOSE set_content_type 'application/x-www-form-urlencoded' end diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb index 3484b5b681..5c543e769d 100644 --- a/lib/net/http/header.rb +++ b/lib/net/http/header.rb @@ -14,9 +14,9 @@ module Net::HTTPHeader @header = {} return unless initheader initheader.each do |key, value| - warn "net/http: warning: duplicated HTTP header: #{key}" if key?(key) and $VERBOSE + warn "net/http: duplicated HTTP header: #{key}", uplevel: 1 if key?(key) and $VERBOSE if value.nil? - warn "net/http: warning: nil HTTP header: #{key}" if $VERBOSE + warn "net/http: nil HTTP header: #{key}", uplevel: 1 if $VERBOSE else @header[key.downcase] = [value.strip] end diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb index ee02f4be4a..6a78272ac8 100644 --- a/lib/net/http/response.rb +++ b/lib/net/http/response.rb @@ -140,17 +140,17 @@ class Net::HTTPResponse # def response #:nodoc: - warn "#{caller(1, 1)[0]}: warning: Net::HTTPResponse#response is obsolete" if $VERBOSE + warn "Net::HTTPResponse#response is obsolete", uplevel: 1 if $VERBOSE self end def header #:nodoc: - warn "#{caller(1, 1)[0]}: warning: Net::HTTPResponse#header is obsolete" if $VERBOSE + warn "Net::HTTPResponse#header is obsolete", uplevel: 1 if $VERBOSE self end def read_header #:nodoc: - warn "#{caller(1, 1)[0]}: warning: Net::HTTPResponse#read_header is obsolete" if $VERBOSE + warn "Net::HTTPResponse#read_header is obsolete", uplevel: 1 if $VERBOSE self end diff --git a/lib/net/imap.rb b/lib/net/imap.rb index bb6754c732..3d33b94fdd 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -2032,8 +2032,7 @@ module Net # generate a warning message to +stderr+, then return # the value of +subtype+. def media_subtype - $stderr.printf("warning: media_subtype is obsolete.\n") - $stderr.printf(" use subtype instead.\n") + warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1) return subtype end end @@ -2060,8 +2059,7 @@ module Net # generate a warning message to +stderr+, then return # the value of +subtype+. def media_subtype - $stderr.printf("warning: media_subtype is obsolete.\n") - $stderr.printf(" use subtype instead.\n") + warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1) return subtype end end @@ -2090,8 +2088,7 @@ module Net # generate a warning message to +stderr+, then return # the value of +subtype+. def media_subtype - $stderr.printf("warning: media_subtype is obsolete.\n") - $stderr.printf(" use subtype instead.\n") + warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1) return subtype end end @@ -2151,8 +2148,7 @@ module Net # generate a warning message to +stderr+, then return # the value of +subtype+. def media_subtype - $stderr.printf("warning: media_subtype is obsolete.\n") - $stderr.printf(" use subtype instead.\n") + warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1) return subtype end end |