ruby-changes:8784
From: yugui <ko1@a...>
Date: Sat, 22 Nov 2008 23:52:11 +0900 (JST)
Subject: [ruby-changes:8784] Ruby:r20320 (ruby_1_9_1): merges r20288 from trunk into ruby_1_9_1.
yugui 2008-11-22 23:51:57 +0900 (Sat, 22 Nov 2008) New Revision: 20320 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20320 Log: merges r20288 from trunk into ruby_1_9_1. * lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust indentation to shut up warning. [ruby-core:19993] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/lib/minitest/unit.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 20319) +++ ruby_1_9_1/ChangeLog (revision 20320) @@ -1,3 +1,8 @@ +Thu Nov 20 07:27:36 2008 Yukihiro Matsumoto <matz@r...> + + * lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust + indentation to shut up warning. [ruby-core:19993] + Wed Nov 19 17:48:05 2008 Yukihiro Matsumoto <matz@r...> * ext/syck/rubyext.c (rb_syck_mktime): return DateTime for a value Index: ruby_1_9_1/lib/minitest/unit.rb =================================================================== --- ruby_1_9_1/lib/minitest/unit.rb (revision 20319) +++ ruby_1_9_1/lib/minitest/unit.rb (revision 20320) @@ -191,12 +191,12 @@ assert caught, message(msg) { default } end - def capture_io - require 'stringio' + def capture_io + require 'stringio' - orig_stdout, orig_stderr = $stdout, $stderr - captured_stdout, captured_stderr = StringIO.new, StringIO.new - $stdout, $stderr = captured_stdout, captured_stderr + orig_stdout, orig_stderr = $stdout, $stderr + captured_stdout, captured_stderr = StringIO.new, StringIO.new + $stdout, $stderr = captured_stdout, captured_stderr yield -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/