aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-13 03:54:53 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-13 03:54:53 +0000
commit69cb0ca3e4893cbe90f610c2f39ea309ce05e1b5 (patch)
treed0360cca5034144c44af5204ee0e2c245949beb8
parent4247bfd60a15438e6adbabff682e96a235e2d241 (diff)
downloadruby-69cb0ca3e4893cbe90f610c2f39ea309ce05e1b5.tar.gz
* ext/psych/lib/psych/deprecated.rb (Object#to_yaml_properties):
undef to_yaml_properties before redefine it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/psych/lib/psych/deprecated.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6360273bfa..3c713064e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 13 12:23:39 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/psych/lib/psych/deprecated.rb (Object#to_yaml_properties):
+ undef to_yaml_properties before redefine it.
+
Mon Jun 13 11:30:10 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* ext/openssl/ossl_digest.c: allow Digests to be created by sn, ln or
diff --git a/ext/psych/lib/psych/deprecated.rb b/ext/psych/lib/psych/deprecated.rb
index f4034e32c0..333c3a1016 100644
--- a/ext/psych/lib/psych/deprecated.rb
+++ b/ext/psych/lib/psych/deprecated.rb
@@ -76,6 +76,7 @@ module Psych
end
class Object
+ undef :to_yaml_properties rescue nil
def to_yaml_properties # :nodoc:
instance_variables
end