nagachika	2016-03-09 05:11:37 +0900 (Wed, 09 Mar 2016)

  New Revision: 54044

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54044

  Log:
    revert r54041. it breaks openssl tests.

  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/io.c
    branches/ruby_2_2/test/ruby/test_io.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/io.c
===================================================================
--- ruby_2_2/io.c	(revision 54043)
+++ ruby_2_2/io.c	(revision 54044)
@@ -2483,7 +2483,7 @@ io_getpartial(int argc, VALUE *argv, VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_2/io.c#L2483
     long n, len;
     struct read_internal_arg arg;
 
-    rb_scan_args(argc, argv, "11", &length, &str);
+    rb_scan_args(argc, argv, "11:", &length, &str, NULL);
 
     if ((len = NUM2LONG(length)) < 0) {
 	rb_raise(rb_eArgError, "negative length %ld given", len);
@@ -2675,10 +2675,8 @@ io_read_nonblock(int argc, VALUE *argv, https://github.com/ruby/ruby/blob/trunk/ruby_2_2/io.c#L2675
 
     rb_scan_args(argc, argv, "11:", NULL, NULL, &opts);
 
-    if (!NIL_P(opts) && Qfalse == get_kwargs_exception(opts)) {
+    if (!NIL_P(opts) && Qfalse == get_kwargs_exception(opts))
 	no_exception = 1;
-	argc--;
-    }
 
     ret = io_getpartial(argc, argv, io, 1, no_exception);
 
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54043)
+++ ruby_2_2/ChangeLog	(revision 54044)
@@ -17,12 +17,6 @@ Wed Mar  9 04:15:20 2016  Eric Wong  <e@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L17
 	* test/stringio/test_stringio.rb (test_binmode): new test
 	  [ruby-core:72699] [Bug #11945]
 
-Wed Mar  9 04:05:36 2016  Eric Wong  <e@8...>
-
-	* io.c (io_getpartial): remove unused kwarg from template
-	* test/ruby/test_io.rb (test_readpartial_bad_args): new
-	  [Bug #11885]
-
 Wed Mar  9 03:53:37 2016  Tadashi Saito  <tadashi_saito@d...>
 
 	* compile.c, cont.c, doc, man: fix common misspelling.
Index: ruby_2_2/test/ruby/test_io.rb
===================================================================
--- ruby_2_2/test/ruby/test_io.rb	(revision 54043)
+++ ruby_2_2/test/ruby/test_io.rb	(revision 54044)
@@ -3152,17 +3152,6 @@ End https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_io.rb#L3152
     }
   end
 
-  def test_readpartial_bad_args
-    IO.pipe do |r, w|
-      w.write '.'
-      buf = String.new
-      assert_raise(ArgumentError) { r.readpartial(1, buf, exception: false) }
-      assert_raise(TypeError) { r.readpartial(1, exception: false) }
-      assert_equal [[r],[],[]], IO.select([r], nil, nil, 1)
-      assert_equal '.', r.readpartial(1)
-    end
-  end
-
   def test_sysread_unlocktmp_ensure
     bug8669 = '[ruby-core:56121] [Bug #8669]'
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54043)
+++ ruby_2_2/version.h	(revision 54044)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-09"
-#define RUBY_PATCHLEVEL 248
+#define RUBY_PATCHLEVEL 249
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

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