diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/open-uri.rb | 6 | ||||
| -rw-r--r-- | lib/resolv-replace.rb | 1 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sat Oct 30 07:01:53 2010 Tanaka Akira <akr@fsij.org> + + * lib/resolv-replace.rb: suppress warning. + + * lib/open-uri.rb: ditto. + Sat Oct 30 06:32:52 2010 Tanaka Akira <akr@fsij.org> * test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 6706068300..c8393fa437 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -126,7 +126,7 @@ module OpenURI def OpenURI.open_uri(name, *rest) # :nodoc: uri = URI::Generic === name ? name : URI.parse(name) - mode, perm, rest = OpenURI.scan_open_optional_arguments(*rest) + mode, _, rest = OpenURI.scan_open_optional_arguments(*rest) options = rest.shift if !rest.empty? && Hash === rest.first raise ArgumentError.new("extra arguments") if !rest.empty? options ||= {} @@ -480,7 +480,7 @@ module OpenURI # It is downcased for canonicalization. # Content-Type parameters are stripped. def content_type - type, *parameters = content_type_parse + type, *_ = content_type_parse type || 'application/octet-stream' end @@ -712,7 +712,7 @@ module URI when 0 # no proxy setting anyway. proxy_uri = nil when 1 - k, v = pairs.shift + k, _ = pairs.shift if k == 'http_proxy' && ENV[k.upcase] == nil # http_proxy is safe to use because ENV is case sensitive. proxy_uri = ENV[name] diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb index b63eae8f02..ff34f90db4 100644 --- a/lib/resolv-replace.rb +++ b/lib/resolv-replace.rb @@ -51,7 +51,6 @@ class UDPSocket < IPSocket rescue Resolv::ResolvError raise SocketError, "Hostname not known: #{host}" end - err = nil addrs[0...-1].each {|addr| begin return original_resolv_send(mesg, flags, addr, port) |