naruse	2012-02-11 03:38:08 +0900 (Sat, 11 Feb 2012)

  New Revision: 34545

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

  Log:
    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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/rexml/test_order.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34544)
+++ ruby_1_9_3/ChangeLog	(revision 34545)
@@ -1,3 +1,9 @@
+Sat Feb 11 03:37:56 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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  <usa@r...>
 
 	* ext/zlib/zlib.c (rb_gzreader_initialize): revert a part of r33937.
@@ -2,2 +8,3 @@
 	  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.
@@ -7,6 +14,7 @@
 	  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  <luislavena@g...>
 
 	* ext/zlib/zlib.c (rb_gzreader_initialize): use binary mode by default
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34544)
+++ ruby_1_9_3/version.h	(revision 34545)
@@ -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
Index: ruby_1_9_3/test/rexml/test_order.rb
===================================================================
--- ruby_1_9_3/test/rexml/test_order.rb	(revision 34544)
+++ ruby_1_9_3/test/rexml/test_order.rb	(revision 34545)
@@ -43,7 +43,7 @@
    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",

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