ruby-core

Gavin pointed out that the patch he applied didn't touch the exception
messages, so here's the pertinent changes against the current CVS.

 --elliott



*********************************************************************
This e-mail and any attachment is confidential. It may only be read, copied and used by the intended recipient(s). If you are not the intended recipient(s), you may not copy, use, distribute, forward, store or disclose this e-mail or any attachment. If you are not the intended recipient(s) or have otherwise received this e-mail in error, you should destroy it and any attachment and notify the sender by reply e-mail or send a message to sysadmin@bluearc.com
*********************************************************************

Attachments (1)

telnet-exceptions-patch.txt (3.11 KB, text/plain)

Sat Aug 16 14:12:48 2003  Elliott Hughes  <enh@acm.org>

	* libs/net/telnet.rb: Improvements to wording of exceptions.

Index: lib/net/telnet.rb
===================================================================
RCS file: /src/ruby/lib/net/telnet.rb,v
retrieving revision 1.21
diff -u -r1.21 telnet.rb
--- lib/net/telnet.rb	11 Aug 2003 22:42:08 -0000	1.21
+++ lib/net/telnet.rb	16 Aug 2003 13:12:06 -0000
@@ -277,7 +277,7 @@
         @options["Binmode"]    = false         
       else
         unless (true == @options["Binmode"] or false == @options["Binmode"])
-          raise ArgumentError, "Binmode option required true or false"
+          raise ArgumentError, "Binmode option must be true or false"
         end
       end
 
@@ -285,7 +285,7 @@
         @options["Telnetmode"] = true          
       else
         unless (true == @options["Telnetmode"] or false == @options["Telnetmode"])
-          raise ArgumentError, "Telnetmode option required true or false"
+          raise ArgumentError, "Telnetmode option must be true or false"
         end
       end
 
@@ -330,7 +330,7 @@
         elsif @options["Proxy"].kind_of?(IO)
           @sock = @options["Proxy"]
         else
-          raise "Error; Proxy is Net::Telnet or IO object."
+          raise "Error: Proxy must be an instance of Net::Telnet or IO."
         end
       else
         message = "Trying " + @options["Host"] + "...\n"
@@ -347,7 +347,7 @@
             end
           end
         rescue TimeoutError
-          raise TimeoutError, "timed-out; opening of the host"
+          raise TimeoutError, "timed out while opening a connection to the host"
         rescue
           @log.write($ERROR_INFO.to_s + "\n") if @options.has_key?("Output_log")
           @dumplog.log_dump('#', $ERROR_INFO.to_s + "\n") if @options.has_key?("Dump_log")
@@ -382,7 +382,7 @@
       when true, false
         @options["Telnetmode"] = mode
       else
-        raise ArgumentError, "required true or false"
+        raise ArgumentError, "argument must be true or false, or missing"
       end
     end
 
@@ -393,7 +393,7 @@
       if (true == mode or false == mode)
         @options["Telnetmode"] = mode
       else
-        raise ArgumentError, "required true or false"
+        raise ArgumentError, "argument must be true or false"
       end
     end
 
@@ -406,7 +406,7 @@
       when true, false
         @options["Binmode"] = mode
       else
-        raise ArgumentError, "required true or false"
+        raise ArgumentError, "argument must be true or false"
       end
     end
 
@@ -415,7 +415,7 @@
       if (true == mode or false == mode)
         @options["Binmode"] = mode
       else
-        raise ArgumentError, "required true or false"
+        raise ArgumentError, "argument must be true or false"
       end
     end
 
@@ -542,7 +542,7 @@
       rest = ''
       until(prompt === line and not IO::select([@sock], nil, nil, waittime))
         unless IO::select([@sock], nil, nil, time_out)
-          raise TimeoutError, "timed-out; wait for the next data"
+          raise TimeoutError, "timed out while waiting for more data"
         end
         begin
           c = @sock.sysread(1024 * 1024)

Thread

Prev Next

In This Thread

Prev Next