nobu	2010-09-25 01:17:58 +0900 (Sat, 25 Sep 2010)

  New Revision: 29338

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

  Log:
    * ext/stringio/stringio.c (Init_stringio): added readpartial,
      read_nonblock and write_nonblock aliases.  [ruby-core:27024]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/stringio/stringio.c
    branches/ruby_1_8/test/stringio/test_stringio.rb
    branches/ruby_1_8/version.h

Index: ruby_1_8/ext/stringio/stringio.c
===================================================================
--- ruby_1_8/ext/stringio/stringio.c	(revision 29337)
+++ ruby_1_8/ext/stringio/stringio.c	(revision 29338)
@@ -1366,6 +1366,8 @@
     rb_define_method(StringIO, "readlines", strio_readlines, -1);
     rb_define_method(StringIO, "read", strio_read, -1);
     rb_define_method(StringIO, "sysread", strio_sysread, -1);
+    rb_define_method(StringIO, "readpartial", strio_sysread, -1);
+    rb_define_method(StringIO, "read_nonblock", strio_sysread, -1);
 
     rb_define_method(StringIO, "write", strio_write, 1);
     rb_define_method(StringIO, "<<", strio_addstr, 1);
@@ -1374,6 +1376,7 @@
     rb_define_method(StringIO, "putc", strio_putc, 1);
     rb_define_method(StringIO, "puts", strio_puts, -1);
     rb_define_method(StringIO, "syswrite", strio_syswrite, 1);
+    rb_define_method(StringIO, "write_nonblock", strio_syswrite, 1);
 
     rb_define_method(StringIO, "isatty", strio_isatty, 0);
     rb_define_method(StringIO, "tty?", strio_isatty, 0);
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 29337)
+++ ruby_1_8/ChangeLog	(revision 29338)
@@ -1,3 +1,8 @@
+Sat Sep 25 01:17:39 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/stringio/stringio.c (Init_stringio): added readpartial,
+	  read_nonblock and write_nonblock aliases.  [ruby-core:27024]
+
 Fri Sep 24 16:22:40 2010  NAKAMURA Usaku  <usa@r...>
 
 	* lib/pathname.rb (relative_path_from): backport r23093 and r25440
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 29337)
+++ ruby_1_8/version.h	(revision 29338)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-09-24"
+#define RUBY_RELEASE_DATE "2010-09-25"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100924
+#define RUBY_RELEASE_CODE 20100925
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/test/stringio/test_stringio.rb
===================================================================
--- ruby_1_8/test/stringio/test_stringio.rb	(revision 29337)
+++ ruby_1_8/test/stringio/test_stringio.rb	(revision 29338)
@@ -102,7 +102,7 @@
     f.close unless f.closed?
   end
 
-  def FOR_1_9_test_write_nonblock
+  def test_write_nonblock
     s = ""
     f = StringIO.new(s, "w")
     f.write_nonblock("foo")
@@ -437,7 +437,7 @@
     end
   end
 
-  def FOR_1_9_test_readpartial
+  def test_readpartial
     f = StringIO.new("\u3042\u3044")
     assert_raise(ArgumentError) { f.readpartial(-1) }
     assert_raise(ArgumentError) { f.readpartial(1, 2, 3) }
@@ -450,13 +450,17 @@
     end
   end
 
-  def FOR_1_9_test_read_nonblock
+  def test_read_nonblock
     f = StringIO.new("\u3042\u3044")
     assert_raise(ArgumentError) { f.read_nonblock(-1) }
     assert_raise(ArgumentError) { f.read_nonblock(1, 2, 3) }
     assert_equal("\u3042\u3044", f.read_nonblock)
     f.rewind
-    assert_equal("\u3042\u3044".force_encoding(Encoding::ASCII_8BIT), f.read_nonblock(f.size))
+    if false # FOR_1_9
+      assert_equal("\u3042\u3044".force_encoding(Encoding::ASCII_8BIT), f.read_nonblock(f.size))
+    else
+      assert_equal("\u3042\u3044", f.read_nonblock(f.size))
+    end
   end
 
   def test_size

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