diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-26 17:22:26 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-26 17:22:26 +0000 |
commit | 1a0b7d0fb6e05704c94d7916aebbaca7c288a86f (patch) | |
tree | 3b804e54858598bb1e1412c8aaee4063d32211ac /lib/delegate.rb | |
parent | 98d6d636e33f2f5bf067df64ae617d86e1f610bc (diff) | |
download | bundler-1a0b7d0fb6e05704c94d7916aebbaca7c288a86f.tar.gz |
* io.c (rb_io_each_byte): caused infinite loop. [ruby-dev:31652]
* io.c (rb_io_getc): should return nil at EOF, not EOFError.
* lib/delegate.rb (SimpleDelegator::__setobj__): use raise
argument to specify backtrace.
* test/ruby/test_fnmatch.rb (TestFnmatch::bracket_test):
String#include? no longer works for Fixnum. use #chr.
[ruby-dev:31652]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/delegate.rb')
-rw-r--r-- | lib/delegate.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb index 01ed0871c6..9084a7f191 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -283,8 +283,7 @@ def DelegateClass(superclass) begin @delegate_dc_obj.__send(:#{method}, *args, &block) rescue - $@[0,2] = nil - raise + raise $!, $@[2..-1] end end EOS |