usa	2012-11-09 13:49:54 +0900 (Fri, 09 Nov 2012)

  New Revision: 37575

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

  Log:
    merge revision(s) 36246:
    
    * test/win32ole/test_win32ole.rb (test_s_codepage_changed):
      FileSystemObject only supports ANSI or UTF-16LE encoding.
      Patch by bosko (Bosko Ivanisevic) [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 37574)
+++ ruby_1_9_3/ChangeLog	(revision 37575)
@@ -1,3 +1,9 @@
+Fri Nov  9 13:47:45 2012  Luis Lavena  <luislavena@g...>
+
+	* test/win32ole/test_win32ole.rb (test_s_codepage_changed):
+	  FileSystemObject only supports ANSI or UTF-16LE encoding.
+	  Patch by bosko (Bosko Ivanisevic) [ruby-trunk - Bug #6650]
+
 Fri Nov  9 13:16:16 2012  Kenta Murata  <mrkn@m...>
 
 	* bignum.c (bigmul0): enable big_mul_toom3.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37574)
+++ ruby_1_9_3/version.h	(revision 37575)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 321
+#define RUBY_PATCHLEVEL 322
 
 #define RUBY_RELEASE_DATE "2012-11-09"
 #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 37574)
+++ ruby_1_9_3/test/win32ole/test_win32ole.rb	(revision 37575)
@@ -372,14 +372,14 @@
           WIN32OLE.codepage = cp
           file = fso.opentextfile(fname, 2, true)
           begin
-            file.write [164, 162].pack("c*").force_encoding("EUC-JP")
+            file.write [164, 162].pack("c*").force_encoding("UTF-16")
           ensure
             file.close
           end
           open(fname, "r:ascii-8bit") {|ifs|
             str = ifs.read
           }
-          assert_equal("\202\240", str)
+          assert_equal("\244\242", str)
         end
 
       ensure

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


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