naruse	2012-02-09 07:31:55 +0900 (Thu, 09 Feb 2012)

  New Revision: 34500

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

  Log:
    merge revision(s) 34499:
    
    * test/pathname/test_pathname.rb: not read but binread.
      patched by Benoit Daloze, [ruby-core:42440] [Bug #5984]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/pathname/test_pathname.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34499)
+++ ruby_1_9_3/ChangeLog	(revision 34500)
@@ -1,3 +1,8 @@
+Thu Feb  9 07:28:43 2012  NARUSE, Yui  <naruse@r...>
+
+	* test/pathname/test_pathname.rb: not read but binread.
+	  patched by Benoit Daloze, [ruby-core:42440] [Bug #5984]
+
 Wed Feb  8 22:29:59 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_modify_expand): fix memory leak.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34499)
+++ ruby_1_9_3/version.h	(revision 34500)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 69
+#define RUBY_PATCHLEVEL 70
 
 #define RUBY_RELEASE_DATE "2012-02-09"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/pathname/test_pathname.rb
===================================================================
--- ruby_1_9_3/test/pathname/test_pathname.rb	(revision 34499)
+++ ruby_1_9_3/test/pathname/test_pathname.rb	(revision 34500)
@@ -714,7 +714,7 @@
   def test_binread
     with_tmpchdir('rubytest-pathname') {|dir|
       open("a", "w") {|f| f.write "abc" }
-      assert_equal("abc", Pathname("a").read)
+      assert_equal("abc", Pathname("a").binread)
     }
   end
 

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