archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 10:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 36246:

Browse source 
* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-11-09 04:49:54 +00:00
parent 014347511c
commit ba09c0a346
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Nov 9 13:47:45 2012 Luis Lavena <luislavena@gmail.com>
* 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@mrkn.jp> Fri Nov 9 13:16:16 2012 Kenta Murata <mrkn@mrkn.jp>
* bignum.c (bigmul0): enable big_mul_toom3. * bignum.c (bigmul0): enable big_mul_toom3.

4
test/win32ole/test_win32ole.rb
View file

@ -372,14 +372,14 @@ if defined?(WIN32OLE)
WIN32OLE.codepage = cp WIN32OLE.codepage = cp
file = fso.opentextfile(fname, 2, true) file = fso.opentextfile(fname, 2, true)
begin begin
file.write [164, 162].pack("c*").force_encoding("EUC-JP") file.write [164, 162].pack("c*").force_encoding("UTF-16")
ensure ensure
file.close file.close
end end
open(fname, "r:ascii-8bit") {|ifs| open(fname, "r:ascii-8bit") {|ifs|
str = ifs.read str = ifs.read
} }
assert_equal("\202\240", str) assert_equal("\244\242", str)
end end
ensure ensure

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 321 #define RUBY_PATCHLEVEL 322
#define RUBY_RELEASE_DATE "2012-11-09" #define RUBY_RELEASE_DATE "2012-11-09"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012