mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/yaml.rb: explicitly specify ::Object to avoid the collision with
Syck::Object. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5a883a2cf4
commit
f2bd0ce993
3 changed files with 7 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
|||
Wed Sep 7 17:27:18 2011 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* lib/yaml.rb: explicitly specify ::Object to avoid the collision with
|
||||
Syck::Object.
|
||||
|
||||
Tue Sep 6 21:06:49 2011 Shota Fukumori <sorah@tubusu.net>
|
||||
|
||||
* lib/test/unit.rb (_run_suites): Now reports are written the
|
||||
|
|
|
@ -30,7 +30,7 @@ module YAML
|
|||
|
||||
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
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
# $Id$
|
||||
#
|
||||
require 'test/unit'
|
||||
require 'syck'
|
||||
require 'yaml'
|
||||
require 'syck/ypath'
|
||||
|
||||
|
|
Loading…
Reference in a new issue