nobu	2009-06-13 06:50:35 +0900 (Sat, 13 Jun 2009)

  New Revision: 23674

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

  Log:
    * lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): TimeoutError is
      obsolete, use Timeout::Error instead.  [ruby-core:23821]

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/protocol.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23673)
+++ ChangeLog	(revision 23674)
@@ -1,3 +1,8 @@
+Sat Jun 13 06:50:31 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): TimeoutError is
+	  obsolete, use Timeout::Error instead.  [ruby-core:23821]
+
 Sat Jun 13 06:45:46 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_eval.c (rb_f_throw): fixed rdoc about execption.
Index: lib/net/protocol.rb
===================================================================
--- lib/net/protocol.rb	(revision 23673)
+++ lib/net/protocol.rb	(revision 23674)
@@ -137,7 +137,7 @@
         if IO.select([@io], nil, nil, @read_timeout)
           retry
         else
-          raise Timeout::TimeoutError
+          raise Timeout::Error
         end
       rescue IO::WaitWritable
         # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
@@ -145,7 +145,7 @@
         if IO.select(nil, [@io], nil, @read_timeout)
           retry
         else
-          raise Timeout::TimeoutError
+          raise Timeout::Error
         end
       end
     end

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