From 3b22a82547db1285b9de72b151730d32bf605f7c Mon Sep 17 00:00:00 2001
From: ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 11 Jan 2012 16:40:59 +0000
Subject: [PATCH] merge revision(s) 34129:

	* test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't
	  accept the block argument.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            |  5 +++++
 test/ruby/test_io.rb | 43 ++++++++++++++++++++-----------------------
 version.h            |  6 +++---
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c71f444ba..0c07b288a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 12 01:40:33 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't
+	  accept the block argument.
+
 Sat Jan  7 22:46:36 2012  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rexml/parsers/baseparser.rb: use private instead of _xxx
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 4276157a20..6e4d088bf9 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -1395,32 +1395,29 @@ class TestIO < Test::Unit::TestCase
     feature2250 = '[ruby-core:26222]'
     pre = 'ft2250'
 
-    Tempfile.new(pre) do |t|
-      f = IO.for_fd(t.fileno)
-      assert_equal(true, f.autoclose?)
-      f.autoclose = false
-      assert_equal(false, f.autoclose?)
-      f.close
-      assert_nothing_raised(Errno::EBADF) {t.close}
+    t = Tempfile.new(pre)
+    f = IO.for_fd(t.fileno)
+    assert_equal(true, f.autoclose?)
+    f.autoclose = false
+    assert_equal(false, f.autoclose?)
+    f.close
+    assert_nothing_raised(Errno::EBADF) {t.close}
 
-      t.open
-      f = IO.for_fd(t.fileno, autoclose: false)
-      assert_equal(false, f.autoclose?)
-      f.autoclose = true
-      assert_equal(true, f.autoclose?)
-      f.close
-      assert_raise(Errno::EBADF) {t.close}
-    end
+    t.open
+    f = IO.for_fd(t.fileno, autoclose: false)
+    assert_equal(false, f.autoclose?)
+    f.autoclose = true
+    assert_equal(true, f.autoclose?)
+    f.close
+    assert_raise(Errno::EBADF) {t.close}
 
-    Tempfile.new(pre) do |t|
-      try_fdopen(t.fileno)
-      assert_raise(Errno::EBADF) {t.close}
-    end
+    t = Tempfile.new(pre)
+    try_fdopen(t.fileno)
+    assert_raise(Errno::EBADF) {t.close}
 
-    Tempfile.new(pre) do |t|
-      try_fdopen(f.fileno, false)
-      assert_nothing_raised(Errno::EBADF) {t.close}
-    end
+    t = Tempfile.new(pre)
+    try_fdopen(t.fileno, false)
+    assert_nothing_raised(Errno::EBADF) {t.close}
   end
 
   def test_open_redirect
diff --git a/version.h b/version.h
index 03093f1f5d..51c491e145 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 21
+#define RUBY_PATCHLEVEL 22
 
-#define RUBY_RELEASE_DATE "2012-01-10"
+#define RUBY_RELEASE_DATE "2012-01-12"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 12
 
 #include "ruby/version.h"