ruby-changes:22657
From: shirosaki <ko1@a...>
Date: Mon, 20 Feb 2012 21:30:24 +0900 (JST)
Subject: [ruby-changes:22657] shirosaki:r34706 (trunk): * lib/fileutils.rb: revert a line modified accidentally at r34669.
shirosaki 2012-02-20 21:30:11 +0900 (Mon, 20 Feb 2012) New Revision: 34706 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34706 Log: * lib/fileutils.rb: revert a line modified accidentally at r34669. This fixes mingw test errors in TestDir_M17N. [ruby-core:42728] [Feature #4970] Modified files: trunk/ChangeLog trunk/lib/fileutils.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 34705) +++ ChangeLog (revision 34706) @@ -1,3 +1,9 @@ +Mon Feb 20 21:16:48 2012 Hiroshi Shirosaki <h.shirosaki@g...> + + * lib/fileutils.rb: revert a line modified accidentally at r34669. + This fixes mingw test errors in TestDir_M17N. + [ruby-core:42728] [Feature #4970] + Mon Feb 20 21:09:27 2012 Tanaka Akira <akr@f...> * ext/curses/curses.c (Init_curses): define Curses::VERSION. Index: lib/fileutils.rb =================================================================== --- lib/fileutils.rb (revision 34705) +++ lib/fileutils.rb (revision 34706) @@ -1342,7 +1342,7 @@ def entries opts = {} - opts[:encoding] = "UTF-8" if /mswin|mignw/ =~ RUBY_PLATFORM + opts[:encoding] = ::Encoding::UTF_8 if fu_windows? Dir.entries(path(), opts)\ .reject {|n| n == '.' or n == '..' }\ .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/