usa	2012-11-08 14:49:26 +0900 (Thu, 08 Nov 2012)

  New Revision: 37555

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

  Log:
    merge revision(s) 36306: [Backport #7296]
    
    * test/win32ole/test_win32ole.rb (test_s_codepage_changed):
      FileSystemObject only supports ANSI or UTF-16LE encoding.
      Patch by h.shirosaki (Hiroshi Shirosaki) [ruby-trunk - Bug #6650]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/win32ole/test_win32ole.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37554)
+++ ruby_1_9_3/ChangeLog	(revision 37555)
@@ -1,3 +1,10 @@
+Thu Nov  8 14:46:17 2012  Masaki Suketa <masaki.suketa@n...>
+
+	* test/win32ole/test_win32ole.rb (test_s_codepage_changed):
+	  FileSystemObject only supports ANSI or UTF-16LE encoding.
+	  Patch by h.shirosaki (Hiroshi Shirosaki) [ruby-trunk - Bug #6650]
+
+
 Thu Nov  8 14:43:17 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/test_dir_m17n.rb: refactoring. RE should be in the left side
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37554)
+++ ruby_1_9_3/version.h	(revision 37555)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 311
+#define RUBY_PATCHLEVEL 312
 
 #define RUBY_RELEASE_DATE "2012-11-08"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/win32ole/test_win32ole.rb
===================================================================
--- ruby_1_9_3/test/win32ole/test_win32ole.rb	(revision 37554)
+++ ruby_1_9_3/test/win32ole/test_win32ole.rb	(revision 37555)
@@ -351,8 +351,9 @@
 
         WIN32OLE.codepage = cp
         file = fso.opentextfile(fname, 2, true)
+        test_str = [0x3042].pack("U*").encode("UTF-16LE")
         begin
-          file.write [0x3042].pack("U*").force_encoding("UTF-8")
+          file.write test_str.force_encoding("UTF-16")
         ensure
           file.close
         end
@@ -360,7 +361,7 @@
         open(fname, "r:ascii-8bit") {|ifs|
           str = ifs.read
         }
-        assert_equal("\202\240", str)
+        assert_equal(test_str.force_encoding("ascii-8bit"), str)
 
         # This test fail if codepage 20932 (euc) is not installed.
         begin

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36306


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