diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:54:01 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:54:01 +0000 |
| commit | 4de39cd34edf69376af707071f0a6fbeed90e091 (patch) | |
| tree | 9e2fb3eb43345520a6848fb60eaa565a888941ad /lib | |
| parent | 1e8b18dfa25d94c1d24d6d5be5172bb0cee2a987 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/ftp.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 4a7a6a72c9..468a242154 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -544,7 +544,7 @@ module Net 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 @@ module Net 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) |