From 9bb7dfa247b0dd1bb3ad1f596720d205835c6201 Mon Sep 17 00:00:00 2001 From: normal Date: Tue, 7 Oct 2014 20:00:09 +0000 Subject: normalize reference to Timeout::Error From: John Bachir * 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 --- bootstraptest/test_io.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstraptest/test_io.rb') diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb index cee8cb399e..1d2b19368a 100644 --- a/bootstraptest/test_io.rb +++ b/bootstraptest/test_io.rb @@ -26,7 +26,7 @@ assert_finish 10, %q{ t1.join t2.join end - rescue LoadError, TimeoutError, NotImplementedError + rescue LoadError, Timeout::Error, NotImplementedError end }, '[ruby-dev:32566]' -- cgit v1.2.3