ayumin	2012-01-12 01:40:59 +0900 (Thu, 12 Jan 2012)

  New Revision: 34273

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34273

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

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_io.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34272)
+++ ruby_1_9_3/ChangeLog	(revision 34273)
@@ -1,3 +1,8 @@
+Thu Jan 12 01:40:33 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@c...>
 
 	* lib/rexml/parsers/baseparser.rb: use private instead of _xxx
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34272)
+++ ruby_1_9_3/version.h	(revision 34273)
@@ -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"
 
Index: ruby_1_9_3/test/ruby/test_io.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_io.rb	(revision 34272)
+++ ruby_1_9_3/test/ruby/test_io.rb	(revision 34273)
@@ -1395,32 +1395,29 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/