* lib/net/ftp.rb: use frozen_string_literal: true.

* test/net/ftp/test_buffered_socket.rb: ditto.

* test/net/ftp/test_ftp.rb: ditto.

* test/net/ftp/test_mlsx_entry.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 28 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0089022ca3..1a873d1195 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Oct  9 15:52:28 2015  Shugo Maeda  <[email protected]>
+
+	* lib/net/ftp.rb: use frozen_string_literal: true.
+
+	* test/net/ftp/test_buffered_socket.rb: ditto.
+
+	* test/net/ftp/test_ftp.rb: ditto.
+
+	* test/net/ftp/test_mlsx_entry.rb: ditto.
+
 Fri Oct  9 14:12:35 2015  Shota Fukumori (sora_h)  <[email protected]>
 
 	* ext/openssl/lib/openssl/ssl.rb: Revert r52082 because it was
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 9ce161b7e7..2269b750d1 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -1,4 +1,6 @@
 #
+# -*- frozen_string_literal: true -*-
+#
 # = net/ftp.rb - FTP Client Library
 #
 # Written by Shugo Maeda <[email protected]>.
@@ -610,7 +612,7 @@ module Net
           f = open(localfile, "w")
         end
       elsif !block_given?
-        result = ""
+        result = String.new
       end
       begin
         f.binmode if localfile
@@ -637,7 +639,7 @@ module Net
       if localfile
         f = open(localfile, "w")
       elsif !block_given?
-        result = ""
+        result = String.new
       end
       begin
         retrlines("RETR #{remotefile}") do |line, newline|
@@ -1287,11 +1289,11 @@ module Net
 
       def read(len = nil)
         if len
-          s = super(len, "", true)
+          s = super(len, String.new, true)
           return s.empty? ? nil : s
         else
           result = ""
-          while s = super(DEFAULT_BLOCKSIZE, "", true)
+          while s = super(DEFAULT_BLOCKSIZE, String.new, true)
             break if s.empty?
             result << s
           end
diff --git a/test/net/ftp/test_buffered_socket.rb b/test/net/ftp/test_buffered_socket.rb
index 8d7cc2ed52..419d50bb53 100644
--- a/test/net/ftp/test_buffered_socket.rb
+++ b/test/net/ftp/test_buffered_socket.rb
@@ -1,3 +1,6 @@
+#
+# -*- frozen_string_literal: true -*-
+
 require "net/ftp"
 require "test/unit"
 require "ostruct"
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index ba076dd779..ae3649ec1c 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -1,3 +1,6 @@
+#
+# -*- frozen_string_literal: true -*-
+
 require "net/ftp"
 require "test/unit"
 require "ostruct"
@@ -545,7 +548,7 @@ class FTPTest < Test::Unit::TestCase
         assert_match(/\AUSER /, commands.shift)
         assert_match(/\APASS /, commands.shift)
         assert_equal("TYPE I\r\n", commands.shift)
-        buf = ""
+        buf = String.new
         assert_raise(Net::ReadTimeout) do
           ftp.retrbinary("RETR foo", 1024) do |s|
             buf << s
@@ -602,7 +605,7 @@ class FTPTest < Test::Unit::TestCase
         assert_match(/\AUSER /, commands.shift)
         assert_match(/\APASS /, commands.shift)
         assert_equal("TYPE I\r\n", commands.shift)
-        buf = ""
+        buf = String.new
         ftp.retrbinary("RETR foo", 1024) do |s|
           buf << s
         end
@@ -785,7 +788,7 @@ EOF
         assert_match(/\AUSER /, commands.shift)
         assert_match(/\APASS /, commands.shift)
         assert_equal("TYPE I\r\n", commands.shift)
-        buf = ""
+        buf = String.new
         ftp.retrlines("RETR foo") do |line|
           buf << line + "\r\n"
         end
diff --git a/test/net/ftp/test_mlsx_entry.rb b/test/net/ftp/test_mlsx_entry.rb
index 865cf911b9..7321caad7d 100644
--- a/test/net/ftp/test_mlsx_entry.rb
+++ b/test/net/ftp/test_mlsx_entry.rb
@@ -1,3 +1,6 @@
+#
+# -*- frozen_string_literal: true -*-
+
 require "net/ftp"
 require "test/unit"
 require "ostruct"