kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

adjust style and fix typo and indent

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kazu 2012-12-05 15:48:11 +00:00
parent 1b648d0467
commit 61f46bafa4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,9 +1,10 @@
Wed Dec 5 04:50:17 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Wed Dec 5 04:50:17 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* lib/timeout.rb (Timeout#timeout): set * lib/timeout.rb (Timeout#timeout): set
async_interrupt_timeing(:on_blocking) by default. async_interrupt_timing(:on_blocking) by default.
[Bug #7503] [ruby-core:50524] [Bug #7503] [ruby-core:50524]
* test/test_timeout.rb (#test_timeout_blocking): test for the above. * test/test_timeout.rb (test_timeout_blocking): test for the above.
* test/test_timeout.rb (test_timeout_immediate): ditto * test/test_timeout.rb (test_timeout_immediate): ditto
* test/test_timeout.rb (test_timeout_immediate2): ditto. * test/test_timeout.rb (test_timeout_immediate2): ditto.

2
lib/timeout.rb
View file

@ -48,7 +48,7 @@ module Timeout
# Timeout</tt> into your classes so they have a #timeout method, as well as # 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(). # a module method, so you can call it directly as Timeout.timeout().
def timeout(sec, klass = nil, immediate: false) #:yield: +sec+ def timeout(sec, klass = nil, immediate: false) #:yield: +sec+
return yield(sec) if sec == nil or sec.zero? return yield(sec) if sec == nil or sec.zero?
Thread.async_interrupt_timing(klass ? klass : ExitException => immediate ? :immediate : :on_blocking) do Thread.async_interrupt_timing(klass ? klass : ExitException => immediate ? :immediate : :on_blocking) do
exception = klass || Class.new(ExitException) exception = klass || Class.new(ExitException)
begin begin