ruby-changes:25529
From: usa <ko1@a...>
Date: Fri, 9 Nov 2012 16:16:11 +0900 (JST)
Subject: [ruby-changes:25529] usa:r37586 (ruby_1_9_3): merge revision(s) 36332:
usa 2012-11-09 16:16:02 +0900 (Fri, 09 Nov 2012) New Revision: 37586 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37586 Log: merge revision(s) 36332: * test/csv/test_features.rb: add require for Tempfile. * test/csv/test_serialization.rb: ditto. Modified directories: branches/ruby_1_9_3/ Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/test/csv/test_features.rb branches/ruby_1_9_3/test/csv/test_serialization.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 37585) +++ ruby_1_9_3/ChangeLog (revision 37586) @@ -1,3 +1,8 @@ +Fri Nov 9 16:15:50 2012 CHIKANAGA Tomoyuki <nagachika@r...> + + * test/csv/test_features.rb: add require for Tempfile. + * test/csv/test_serialization.rb: ditto. + Fri Nov 9 13:47:45 2012 Luis Lavena <luislavena@g...> * test/win32ole/test_win32ole.rb (test_s_codepage_changed): Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 37585) +++ ruby_1_9_3/version.h (revision 37586) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 323 +#define RUBY_PATCHLEVEL 324 #define RUBY_RELEASE_DATE "2012-11-09" #define RUBY_RELEASE_YEAR 2012 Index: ruby_1_9_3/test/csv/test_features.rb =================================================================== --- ruby_1_9_3/test/csv/test_features.rb (revision 37585) +++ ruby_1_9_3/test/csv/test_features.rb (revision 37586) @@ -10,6 +10,7 @@ require "zlib" require_relative "base" +require "tempfile" class TestCSV::Features < TestCSV extend DifferentOFS Index: ruby_1_9_3/test/csv/test_serialization.rb =================================================================== --- ruby_1_9_3/test/csv/test_serialization.rb (revision 37585) +++ ruby_1_9_3/test/csv/test_serialization.rb (revision 37586) @@ -8,6 +8,7 @@ # under the terms of Ruby's license. require_relative "base" +require "tempfile" # An example of how to provide custom CSV serialization. class Hash Property changes on: ruby_1_9_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r36332 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/