ruby-changes:20655
From: naruse <ko1@a...>
Date: Wed, 27 Jul 2011 17:59:58 +0900 (JST)
Subject: [ruby-changes:20655] naruse:r32703 (ruby_1_9_3): merge revision(s) 32699:
naruse 2011-07-27 17:59:35 +0900 (Wed, 27 Jul 2011) New Revision: 32703 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32703 Log: merge revision(s) 32699: ------------------------------------------------------------------------ r32699 | naruse | 2011-07-27 14:21:33 +0900 (Wed, 27 Jul 2011) | 4 lines Use ::Syck explicitly. lib/rubygems/requirement.rb defines YAML::Syck. So explicitly specify the top level one. ------------------------------------------------------------------------ Modified files: branches/ruby_1_9_3/test/psych/test_engine_manager.rb Index: ruby_1_9_3/test/psych/test_engine_manager.rb =================================================================== --- ruby_1_9_3/test/psych/test_engine_manager.rb (revision 32702) +++ ruby_1_9_3/test/psych/test_engine_manager.rb (revision 32703) @@ -21,7 +21,7 @@ def test_set_syck YAML::ENGINE.yamler = 'syck' - assert_equal Syck, YAML + assert_equal ::Syck, YAML assert_equal 'syck', YAML::ENGINE.yamler end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/