nobu	2011-12-28 11:22:52 +0900 (Wed, 28 Dec 2011)

  New Revision: 34146

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

  Log:
    * lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
      instead of typoed regexp.  [ruby-core:41829] [Bug #5817]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/fileutils.rb
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/fileutils.rb
    trunk/ChangeLog
    trunk/lib/fileutils.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34145)
+++ ChangeLog	(revision 34146)
@@ -1,3 +1,8 @@
+Wed Dec 28 11:22:45 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
+	  instead of typoed regexp.  [ruby-core:41829] [Bug #5817]
+
 Wed Dec 28 02:08:04 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* vm_insnhelper.c (unknown_keyword_error): add GC guard to prevent
Index: lib/fileutils.rb
===================================================================
--- lib/fileutils.rb	(revision 34145)
+++ lib/fileutils.rb	(revision 34146)
@@ -1271,7 +1271,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)) }
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 34145)
+++ ruby_1_9_2/ChangeLog	(revision 34146)
@@ -1,3 +1,8 @@
+Wed Dec 28 11:22:45 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
+	  instead of typoed regexp.  [ruby-core:41829] [Bug #5817]
+
 Fri Jul  1 06:41:36 2011  Koichi Sasada  <ko1@a...>
 
 	* thread.c (rb_threadptr_check_signal): only wake up main thread.
Index: ruby_1_9_2/lib/fileutils.rb
===================================================================
--- ruby_1_9_2/lib/fileutils.rb	(revision 34145)
+++ ruby_1_9_2/lib/fileutils.rb	(revision 34146)
@@ -1182,7 +1182,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)) }
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34145)
+++ ruby_1_9_3/ChangeLog	(revision 34146)
@@ -1,3 +1,8 @@
+Wed Dec 28 11:22:45 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
+	  instead of typoed regexp.  [ruby-core:41829] [Bug #5817]
+
 Thu Dec 15 10:44:54 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_reject_bang, rb_ary_delete_if): update rdoc.
Index: ruby_1_9_3/lib/fileutils.rb
===================================================================
--- ruby_1_9_3/lib/fileutils.rb	(revision 34145)
+++ ruby_1_9_3/lib/fileutils.rb	(revision 34146)
@@ -1274,7 +1274,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/