diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-23 15:41:04 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-23 15:41:04 +0000 |
| commit | 8c8e17d49917b0f8cb8e1437b78dc1d0a2e6e945 (patch) | |
| tree | d1b5a519ebe1a226e5425cf140e0e62cab2cf5cd /lib/forwardable.rb | |
| parent | f8a83d8563df92a4c8630d15211694435a639609 (diff) | |
| download | ruby-8c8e17d49917b0f8cb8e1437b78dc1d0a2e6e945.tar.gz | |
* lib/forwardable (def_instance_delegator, def_single_delegator):
rescue ::Exception instead of Exception in case Exception is
defined under the target class.
[ruby-core:71175] [Ruby trunk - Bug #11615]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/forwardable.rb')
| -rw-r--r-- | lib/forwardable.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/forwardable.rb b/lib/forwardable.rb index ecc5f03843..d814a756fa 100644 --- a/lib/forwardable.rb +++ b/lib/forwardable.rb @@ -181,7 +181,7 @@ module Forwardable def #{ali}(*args, &block) begin #{accessor}.__send__(:#{method}, *args, &block) - rescue Exception + rescue ::Exception $@.delete_if{|s| Forwardable::FILE_REGEXP =~ s} unless Forwardable::debug ::Kernel::raise end @@ -273,7 +273,7 @@ module SingleForwardable def #{ali}(*args, &block) begin #{accessor}.__send__(:#{method}, *args, &block) - rescue Exception + rescue ::Exception $@.delete_if{|s| Forwardable::FILE_REGEXP =~ s} unless Forwardable::debug ::Kernel::raise end |