ruby-changes:55359
From: naruse <ko1@a...>
Date: Mon, 15 Apr 2019 23:42:39 +0900 (JST)
Subject: [ruby-changes:55359] naruse:r67567 (ruby_2_6): merge revision(s) 67561:
naruse 2019-04-15 23:42:35 +0900 (Mon, 15 Apr 2019) New Revision: 67567 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67567 Log: merge revision(s) 67561: Import CSV 3.0.9 This fixes test failures on Windows. Modified directories: branches/ruby_2_6/ Modified files: branches/ruby_2_6/test/csv/interface/test_read.rb branches/ruby_2_6/version.h Index: ruby_2_6/test/csv/interface/test_read.rb =================================================================== --- ruby_2_6/test/csv/interface/test_read.rb (revision 67566) +++ ruby_2_6/test/csv/interface/test_read.rb (revision 67567) @@ -10,7 +10,7 @@ class TestCSVInterfaceRead < Test::Unit: https://github.com/ruby/ruby/blob/trunk/ruby_2_6/test/csv/interface/test_read.rb#L10 @data = "" @data << "1\t2\t3\r\n" @data << "4\t5\r\n" - @input = Tempfile.new(["interface-read", ".csv"], options: {binmode: true}) + @input = Tempfile.new(["interface-read", ".csv"], binmode: true) @input << @data @input.rewind @rows = [ Index: ruby_2_6/version.h =================================================================== --- ruby_2_6/version.h (revision 67566) +++ ruby_2_6/version.h (revision 67567) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1 #define RUBY_VERSION "2.6.3" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 61 +#define RUBY_PATCHLEVEL 62 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 4 Index: ruby_2_6 =================================================================== --- ruby_2_6 (revision 67566) +++ ruby_2_6 (revision 67567) Property changes on: ruby_2_6 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r67561 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/