summaryrefslogtreecommitdiffstats
path: root/lib/delegate.rb
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-25 14:46:43 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-25 14:46:43 +0000
commit15bd130215935ee74924c9240923ffbb25f70576 (patch)
tree065e21a8c2c041255751aa0429785d3cf9d52ffd /lib/delegate.rb
parent51d5fb54472dcfa3b74a9420e5393544103f5116 (diff)
downloadruby-15bd130215935ee74924c9240923ffbb25f70576.tar.gz
ruby-15bd130215935ee74924c9240923ffbb25f70576.tar.xz
ruby-15bd130215935ee74924c9240923ffbb25f70576.zip
merges r24531 from trunk into ruby_1_9_1.
-- * lib/delegate.rb (Delegator#method_missing): __FILE__ may contain multi-byte characters. a patch from Kenta Murata in [ruby-dev:39066]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/delegate.rb')
-rw-r--r--lib/delegate.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 025e901a8..cb16adbae 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -137,7 +137,7 @@ class Delegator
target.__send__(m, *args, &block)
end
rescue Exception
- $@.delete_if{|s| %r"\A#{__FILE__}:\d+:in `method_missing'\z"o =~ s}
+ $@.delete_if{|s| %r"\A#{Regexp.quote(__FILE__)}:\d+:in `method_missing'\z"o =~ s}
::Kernel::raise
end
end