yugui	2010-01-30 21:54:01 +0900 (Sat, 30 Jan 2010)

  New Revision: 26509

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

  Log:
    merges r25510 from trunk into ruby_1_9_1.
    --
    * lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
      a Pathname instance into a string.  [ruby-core:26237]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/net/ftp.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26508)
+++ ruby_1_9_1/ChangeLog	(revision 26509)
@@ -1,3 +1,8 @@
+Tue Oct 27 15:44:48 2009  Shugo Maeda  <shugo@r...>
+
+	* lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
+	  a Pathname instance into a string.  [ruby-core:26237]
+
 Tue Oct 27 07:53:25 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* gc.c (garbage_collect_with_gvl): do not garbage_collect when
Index: ruby_1_9_1/lib/net/ftp.rb
===================================================================
--- ruby_1_9_1/lib/net/ftp.rb	(revision 26508)
+++ ruby_1_9_1/lib/net/ftp.rb	(revision 26509)
@@ -544,7 +544,7 @@
       end
       begin
 	f.binmode if localfile
-	retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data|
+	retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
 	  f.write(data) if localfile
 	  yield(data) if block_given?
           result.concat(data) if result
@@ -676,7 +676,7 @@
     def list(*args, &block) # :yield: line
       cmd = "LIST"
       args.each do |arg|
-	cmd = cmd + " " + arg
+	cmd = cmd + " " + arg.to_s
       end
       if block
 	retrlines(cmd, &block)
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26508)
+++ ruby_1_9_1/version.h	(revision 26509)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 414
+#define RUBY_PATCHLEVEL 415
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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