diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-07 20:00:09 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-07 20:00:09 +0000 |
| commit | 9bb7dfa247b0dd1bb3ad1f596720d205835c6201 (patch) | |
| tree | b56dce213e629546cd2663c9bd6a6227aa477c5d /lib | |
| parent | 554577015f81be1427207dcf262739c1844d06d8 (diff) | |
normalize reference to Timeout::Error
From: John Bachir <[email protected]>
* bootstraptest/test_io.rb (assert_finish):
normalize rescue for Timeout::Error
* lib/net/ftp.rb (Net#read_timeout): ditto for doc
* lib/resolv.rb (Resolv::ResolvTimeout): ditto for subclass
* lib/webrick/httprequest.rb (_read_data): ditto for rescue
* sample/timeout.rb (p timeout): ditto for call
* test/drb/drbtest.rb (test_06_timeout): ditto
* test/ruby/test_readpartial.rb (test_open_pipe): ditto
* test/thread/test_queue.rb (test_queue_thread_raise): ditto
* thread.c (rb_thread_s_handle_interrupt): ditto for doc
[ruby-core:65481] [misc #10339]
TimeoutError is a legacy constant, Timeout::Error is the canonical constant.
This patch normalizes all code and comments to reference Timeout::Error.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/ftp.rb | 2 | ||||
| -rw-r--r-- | lib/resolv.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httprequest.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 6b452b8a75..c64bb5c682 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -103,7 +103,7 @@ module Net # Number of seconds to wait for one block to be read (via one read(2) # call). Any number may be used, including Floats for fractional # seconds. If the FTP object cannot read data in this many seconds, - # it raises a TimeoutError exception. The default value is 60 seconds. + # it raises a Timeout::Error exception. The default value is 60 seconds. attr_reader :read_timeout # Setter for the read_timeout attribute. diff --git a/lib/resolv.rb b/lib/resolv.rb index 9c7dd1b9b3..293e559acf 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -158,7 +158,7 @@ class Resolv ## # Indicates a timeout resolving a name or address. - class ResolvTimeout < TimeoutError; end + class ResolvTimeout < Timeout::Error; end ## # Resolv::Hosts is a hostname resolver that uses the system hosts file. diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index 4dfaee99af..6aa2d1c1f2 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb @@ -521,7 +521,7 @@ module WEBrick } rescue Errno::ECONNRESET return nil - rescue TimeoutError + rescue Timeout::Error raise HTTPStatus::RequestTimeout end end |