ruby-changes:32956
From: nagachika <ko1@a...>
Date: Tue, 18 Feb 2014 22:39:18 +0900 (JST)
Subject: [ruby-changes:32956] nagachika:r45035 (ruby_2_0_0): merge revision(s) r40833:
nagachika 2014-02-18 22:39:07 +0900 (Tue, 18 Feb 2014) New Revision: 45035 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45035 Log: merge revision(s) r40833: Default script encoding is now UTF-8 Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/test/ruby/envutil.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 45034) +++ ruby_2_0_0/ChangeLog (revision 45035) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Tue Feb 18 22:38:01 2014 Nobuyoshi Nakada <nobu@r...> + + * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately): + specify the encoding of source. + Mon Feb 17 02:00:36 2014 Tanaka Akira <akr@f...> * lib/open-uri.rb: Make proxy disabling working again. Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 45034) +++ ruby_2_0_0/version.h (revision 45035) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-02-17" -#define RUBY_PATCHLEVEL 433 +#define RUBY_RELEASE_DATE "2014-02-18" +#define RUBY_PATCHLEVEL 434 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 18 #include "ruby/version.h" Index: ruby_2_0_0/test/ruby/envutil.rb =================================================================== --- ruby_2_0_0/test/ruby/envutil.rb (revision 45034) +++ ruby_2_0_0/test/ruby/envutil.rb (revision 45035) @@ -160,7 +160,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/envutil.rb#L160 code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) { "#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n" } - code.force_encoding("us-ascii") + code.force_encoding(Encoding::UTF_8) verbose, $VERBOSE = $VERBOSE, nil yield if defined?(yield) case Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40833 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/