From 877469197274d5ee7559e154cfac21dbdcec3854 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 10 Feb 2012 18:38:08 +0000 Subject: merge revision(s) 33981: [Backport #5792] * test/rexml/test_order.rb (OrderTester#test_more_ordering): use GZip::GzReader.open instead of GZip::GzReader.new with File.new. fixed a test error on Windows introduced at r33946. fixed test errors on Windows introduced at r33953. fixed test errors on Windows introduced at r33947. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ test/rexml/test_order.rb | 2 +- version.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8934be1d0..2599e1085a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,20 @@ +Sat Feb 11 03:37:56 2012 NAKAMURA Usaku + + * test/rexml/test_order.rb (OrderTester#test_more_ordering): use + GZip::GzReader.open instead of GZip::GzReader.new with File.new. + fixed a test error on Windows introduced at r33946. + Sat Feb 11 03:37:34 2012 NAKAMURA Usaku * ext/zlib/zlib.c (rb_gzreader_initialize): revert a part of r33937. 1st, to change the mode of an IO is very sensitive problem, so + fixed test errors on Windows introduced at r33953. the maintainer of this library should judge it. 2nd, usually Zlib::GzReader.new is not called directly. #initialize is called via .open, and in the method the I/O is opened in binary mode, so there is no problem without changing the mode in #initialize. + fixed test errors on Windows introduced at r33947. Sat Feb 11 03:23:58 2012 Luis Lavena * ext/zlib/zlib.c (rb_gzreader_initialize): use binary mode by default diff --git a/test/rexml/test_order.rb b/test/rexml/test_order.rb index 2b66d3ab47..a87b1c2728 100644 --- a/test/rexml/test_order.rb +++ b/test/rexml/test_order.rb @@ -43,7 +43,7 @@ END end # Provided by Tom Talbott def test_more_ordering - doc = REXML::Document.new(Zlib::GzipReader.new(File.new(fixture_path('LostineRiver.kml.gz')), encoding: 'utf-8')) + doc = REXML::Document.new(Zlib::GzipReader.open(fixture_path('LostineRiver.kml.gz'), encoding: 'utf-8')) actual = [ "Head south from Phinney Ave N", "Turn left at N 36th St", diff --git a/version.h b/version.h index 4ab468da26..9033e82256 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 90 +#define RUBY_PATCHLEVEL 91 #define RUBY_RELEASE_DATE "2012-02-11" #define RUBY_RELEASE_YEAR 2012 -- cgit v1.2.3