diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/timeout.rb | 3 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Nov 11 01:02:06 2013 Zachary Scott <e@zzak.io> + + * lib/timeout.rb: Added note about change from #8730 [Fixes GH-440] + * NEWS: Improve grammar on change to Timeout + Patched by @srawlins in https://github.com/ruby/ruby/pull/440 + Sun Nov 10 23:47:05 2013 Kazuki Tsujimoto <kazuki@callcc.net> * gc.c (rb_gcdebug_print_obj_condition): catch up recent changes @@ -251,7 +251,7 @@ with all sufficient information, see the ChangeLog file. * Tempfile.create * Timeout - * No longer an exception to terminate the given block can be rescued + * The exception to terminate the given block can no longer be rescued inside the block, by default, unless the exception class is given explicitly. diff --git a/lib/timeout.rb b/lib/timeout.rb index cf46c1db66..ad951d2ffa 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -57,6 +57,9 @@ module Timeout # Returns the result of the block *if* the block completed before # +sec+ seconds, otherwise throws an exception, based on the value of +klass+. # + # The exception thrown to terminate the given block cannot be rescued inside + # the block unless +klass+ is given explicitly. + # # Note that this is both a method of module Timeout, so you can <tt>include # Timeout</tt> into your classes so they have a #timeout method, as well as # a module method, so you can call it directly as Timeout.timeout(). |