diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | error.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_exception.rb | 6 |
3 files changed, 1 insertions, 16 deletions
@@ -18,11 +18,6 @@ Fri Jan 13 17:23:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * load.c (load_unlock): update loading table at once. -Fri Jan 13 16:44:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * error.c (exc_equal): try implicit conversion for delegator. - [ruby-core:41979] [Bug #5865] - Fri Jan 13 03:46:53 2012 Akinori MUSHA <knu@iDaemons.org> * lib/shellwords.rb (Shellwords#shellescape): shellescape() now @@ -732,14 +732,10 @@ exc_equal(VALUE exc, VALUE obj) CONST_ID(id_mesg, "mesg"); if (rb_obj_class(exc) != rb_obj_class(obj)) { - ID id_exception, id_message, id_backtrace; - CONST_ID(id_exception, "exception"); + ID id_message, id_backtrace; CONST_ID(id_message, "message"); CONST_ID(id_backtrace, "backtrace"); - obj = rb_check_funcall(obj, id_exception, 0, 0); - if (obj == Qundef) return Qfalse; - if (rb_obj_class(exc) != rb_obj_class(obj)) return Qfalse; mesg = rb_check_funcall(obj, id_message, 0, 0); if (mesg == Qundef) return Qfalse; backtrace = rb_check_funcall(obj, id_backtrace, 0, 0); diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 22ac2aca1f..028391d1e6 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -380,10 +380,4 @@ end.join load(t.path) end end - - def test_equal - bug5865 = '[ruby-core:41979]' - assert_equal(RuntimeError.new("a"), RuntimeError.new("a"), bug5865) - assert_not_equal(RuntimeError.new("a"), StandardError.new("a"), bug5865) - end end |