aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-23 13:49:56 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-23 13:49:56 +0000
commitab63cdf1ab776ca7ff137c0969bef30965450566 (patch)
treef7a5dae3f808e86c94672696391d8781324a41d8
parentdafab791d56e25a02d58e0ddcfd969dabaf89014 (diff)
downloadruby-ab63cdf1ab776ca7ff137c0969bef30965450566.tar.gz
* lib/open-uri.rb: use respond_to? to test Tempfile.
[ruby-dev:45995] [Bug #6781] reported by hsbt (Hiroshi SHIBATA). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/open-uri.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c930d8d11f..18597f3a53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 23 22:48:19 2012 Tanaka Akira <akr@fsij.org>
+
+ * lib/open-uri.rb: use respond_to? to test Tempfile.
+ [ruby-dev:45995] [Bug #6781] reported by hsbt (Hiroshi SHIBATA).
+
Mon Jul 23 14:43:34 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBPATHENV): LIBPATH is used on AIX, but not
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 07034654a2..7f2a056370 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -149,8 +149,8 @@ module OpenURI
begin
yield io
ensure
- if io.kind_of? Tempfile
- io.close!
+ if io.respond_to? :close!
+ io.close! # Tempfile
else
io.close
end