Skip to content

Commit

Permalink
Merge branch 'harrylove/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
marcel committed Apr 28, 2009
2 parents 5c20304 + d899782 commit 235bc18
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/aws/s3/extensions.rb
Expand Up @@ -127,7 +127,7 @@ def to_header
module Kernel
def __method__(depth = 0)
caller[depth][/`([^']+)'/, 1]
end if RUBY_VERSION < '1.8.7'
end if RUBY_VERSION <= '1.8.7'

def __called_from__
caller[1][/`([^']+)'/, 1]
Expand Down
2 changes: 1 addition & 1 deletion test/extensions_test.rb
Expand Up @@ -139,7 +139,7 @@ def test___method___depth
assert_equal 'foo', b.foo
assert_equal 'bar', b.bar
end
end if RUBY_VERSION < '1.8.7'
end if RUBY_VERSION <= '1.8.7'

class ModuleExtensionsTest < Test::Unit::TestCase
class Foo
Expand Down

0 comments on commit 235bc18

Please sign in to comment.