nagachika	2014-10-16 00:31:03 +0900 (Thu, 16 Oct 2014)

  New Revision: 47958

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

  Log:
    merge revision(s) r47900: [Backport #10035]
    
    * lib/find.rb (Find.find): Call to_path for arguments to obtain
      strings.
      [ruby-core:63713] [Bug #10035] Reported by Herwin.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/find.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47957)
+++ ruby_2_1/ChangeLog	(revision 47958)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Oct 16 00:30:30 2014  Tanaka Akira  <akr@f...>
+
+	* lib/find.rb (Find.find): Call to_path for arguments to obtain
+	  strings.
+	  [ruby-core:63713] [Bug #10035] Reported by Herwin.
+
 Thu Oct 16 00:20:12 2014  Eric Wong  <e@8...>
 
 	* object.c (rb_class_real): do not dereference 0 VALUE
Index: ruby_2_1/lib/find.rb
===================================================================
--- ruby_2_1/lib/find.rb	(revision 47957)
+++ ruby_2_1/lib/find.rb	(revision 47958)
@@ -40,6 +40,7 @@ module Find https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/find.rb#L40
     fs_encoding = Encoding.find("filesystem")
 
     paths.collect!{|d| raise Errno::ENOENT unless File.exist?(d); d.dup}.each do |path|
+      path = path.to_path if path.respond_to? :to_path
       enc = path.encoding == Encoding::US_ASCII ? fs_encoding : path.encoding
       ps = [path]
       while file = ps.shift
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47957)
+++ ruby_2_1/version.h	(revision 47958)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-10-16"
-#define RUBY_PATCHLEVEL 256
+#define RUBY_PATCHLEVEL 257
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47900


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/