* lib/net/telnet.rb: Telnet#print not add "\n".

	* lib/cgi.rb: cgi['key'] is equal cgi['key'][0]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 29 insertions, 22 deletions

diff --git a/lib/cgi.rb b/lib/cgi.rb
index 3dc5d5190..fbb9a346c 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -18,8 +18,8 @@ Wakou Aoyama <wakou@ruby-lang.org>
 
   require "cgi"
   cgi = CGI.new
-  values = cgi['field_name']   # <== array of 'field_name'
-    # if not 'field_name' included, then return [].
+  value = cgi['field_name']   # <== value string for 'field_name'
+    # if not 'field_name' included, then return "".
   fields = cgi.keys            # <== array of field names
 
   # returns true if form has 'field_name'
@@ -27,6 +27,8 @@ Wakou Aoyama <wakou@ruby-lang.org>
   cgi.has_key?('field_name')
   cgi.include?('field_name')
 
+CAUTION! cgi['field_name'] retuen Array with old cgi.rb(included ruby 1.6)
+
 
 === GET FORM VALUES AS HASH
 
@@ -64,13 +66,13 @@ cgi.params is a hash.
 
   require "cgi"
   cgi = CGI.new
-  values = cgi['field_name']   # <== array of 'field_name'
-  values[0].read               # <== body of values[0]
-  values[0].local_path         # <== path to local file of values[0]
-  values[0].original_filename  # <== original filename of values[0]
-  values[0].content_type       # <== content_type of values[0]
+  value = cgi['field_name']   # <== value string for 'field_name'
+  value.read                  # <== body of value
+  value.local_path            # <== path to local file of value
+  value.original_filename     # <== original filename of value
+  value.content_type          # <== content_type of value
 
-and values[0] has StringIO or Tempfile class methods.
+and value has StringIO or Tempfile class methods.
 
 
 === GET COOKIE VALUES
@@ -939,8 +941,21 @@ convert string charset, and set language to "ja".
     end
     private :initialize_query
 
-    def [](*args)
-      @params[*args]
+    def [](key)
+      value = @params[key][0]
+      def value.[](key)
+        $stderr.puts <<END
+CAUTION! cgi['key'] == cgi.params['key'][0] If want Array, use cgi.params['key']
+END
+        self
+      end
+      def value.first
+        $stderr.puts <<END
+CAUTION! cgi['key'] == cgi.params['key'][0] If want Array, use cgi.params['key']
+END
+        self
+      end
+      value
     end
 
     def keys(*args)
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 62a8246d1..b03cbc7a7 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -4,7 +4,7 @@
 
 net/telnet.rb - simple telnet client library
 
-Wakou Aoyama <wakou@fsinet.or.jp>
+Wakou Aoyama <wakou@ruby-lang.org>
 
 
 === MAKE NEW TELNET OBJECT
@@ -90,7 +90,7 @@ of cource, set sync=true or flush is necessary.
 
 Telnet#puts() adds "\n" to the last of "string".
 
-WARNING: Telnet#print() NOT adds "\n" to the last of "string", in the future.
+CAUTION: Telnet#print() NOT adds "\n" to the last of "string".
 
 If "Telnetmode" option is true, then escape IAC code ("\xFF"). If
 "Binmode" option is false, then convert "\n" to EOL(end of line) code.
@@ -504,7 +504,7 @@ module Net
       end
     end
 
-    def _print(string)
+    def print(string)
       string = string.gsub(/#{IAC}/no, IAC + IAC) if @options["Telnetmode"]
 
       if @options["Binmode"]
@@ -524,15 +524,7 @@ module Net
     end
 
     def puts(string)
-      self._print(string + "\n")
-    end
-
-    def print(string)
-      if $VERBOSE
-        $stderr.puts 'WARNING: Telnet#print("string") NOT adds "\n" to the last of "string", in the future.'
-        $stderr.puts '         cf. Telnet#puts().'
-      end
-      self.puts(string)
+      self.print(string + "\n")
     end
 
     def cmd(options)