aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-23 04:19:53 +0000
committerglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-23 04:19:53 +0000
commit03c6297fe8e1f3a06297b32f0ee25440b4b4a214 (patch)
treedf2ff84e9714cb5e4577524ba307ee32ef7719d4
parentce3be9265ee617ab730e21ba1ae04201dc479b3b (diff)
downloadruby-03c6297fe8e1f3a06297b32f0ee25440b4b4a214.tar.gz
Revert "Allow IO#reopen to take a block"
This reverts r59142. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--NEWS1
-rw-r--r--io.c4
-rw-r--r--test/ruby/test_io.rb16
3 files changed, 0 insertions, 21 deletions
diff --git a/NEWS b/NEWS
index cf17e42345..be51f55178 100644
--- a/NEWS
+++ b/NEWS
@@ -44,7 +44,6 @@ with all sufficient information, see the ChangeLog file or Redmine
* IO#pread [Feature #4532]
* IO#pwrite [Feature #4532]
- * IO#reopen takes a block [Feature #2631]
* IOError
diff --git a/io.c b/io.c
index 8b0064b2dc..3482602326 100644
--- a/io.c
+++ b/io.c
@@ -7058,10 +7058,6 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
}
}
- if (rb_block_given_p()) {
- return rb_ensure(rb_yield, file, io_close, file);
- }
-
return file;
}
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 186c148159..791e52b500 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2156,22 +2156,6 @@ class TestIO < Test::Unit::TestCase
}
end
- def test_reopen_with_block
- make_tempfile {|t|
- open(__FILE__) do |f|
- f.gets
- assert_nothing_raised {
- reopened = nil
- f.reopen(t.path) do |_reopened|
- reopened = _reopened
- assert_equal("foo\n", reopened.gets)
- end
- assert_equal(true, reopened.closed?)
- }
- end
- }
- end
-
def test_reopen_inherit
mkcdtmpdir {
system(EnvUtil.rubybin, '-e', <<"End")