naruse	2011-09-07 17:28:42 +0900 (Wed, 07 Sep 2011)

  New Revision: 33208

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33208

  Log:
    * lib/yaml.rb: explicitly specify ::Object to avoid the collision with
      Syck::Object.

  Modified files:
    trunk/ChangeLog
    trunk/lib/yaml.rb
    trunk/test/syck/test_yaml.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33207)
+++ ChangeLog	(revision 33208)
@@ -1,3 +1,8 @@
+Wed Sep  7 17:27:18 2011  NARUSE, Yui  <naruse@r...>
+
+	* lib/yaml.rb: explicitly specify ::Object to avoid the collision with
+	  Syck::Object.
+
 Tue Sep  6 21:06:49 2011  Shota Fukumori  <sorah@t...>
 
 	* lib/test/unit.rb (_run_suites): Now reports are written the
Index: lib/yaml.rb
===================================================================
--- lib/yaml.rb	(revision 33207)
+++ lib/yaml.rb	(revision 33208)
@@ -30,7 +30,7 @@
 
       require engine unless (engine == 'syck' ? Syck : Psych).const_defined?(:VERSION)
 
-      Object.class_eval <<-eorb, __FILE__, __LINE__ + 1
+      ::Object.class_eval <<-eorb, __FILE__, __LINE__ + 1
         remove_const 'YAML'
         YAML = #{engine.capitalize}
         remove_method :to_yaml
Index: test/syck/test_yaml.rb
===================================================================
--- test/syck/test_yaml.rb	(revision 33207)
+++ test/syck/test_yaml.rb	(revision 33208)
@@ -3,6 +3,7 @@
 # $Id$
 #
 require 'test/unit'
+require 'syck'
 require 'yaml'
 require 'syck/ypath'
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/