nagachika	2013-04-16 01:27:33 +0900 (Tue, 16 Apr 2013)

  New Revision: 40313

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

  Log:
    revert r40311(merge revision(s) 40117,40118).
    It breaks rubyci tests.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/curses/curses.c
    branches/ruby_2_0_0/test/test_curses.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40312)
+++ ruby_2_0_0/ChangeLog	(revision 40313)
@@ -3,11 +3,6 @@ Tue Apr 16 00:27:56 2013  Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L3
 	* compile.c (iseq_compile_each): fix of defined? with empty
 	  expression.  [ruby-core:53999] [Bug #8220]
 
-Mon Apr 15 23:19:35 2013  Nobuyoshi Nakada  <nobu@r...>
-
-	* ext/curses/curses.c (Init_curses): fix implementation function,
-	  crmode should be same as cbreak.  [ruby-core:54013] [Bug #8222]
-
 Mon Apr 15 00:25:00 2013  Tanaka Akira  <akr@f...>
 
 	* time.c (num_exact): use to_r method only if to_int method is
Index: ruby_2_0_0/ext/curses/curses.c
===================================================================
--- ruby_2_0_0/ext/curses/curses.c	(revision 40312)
+++ ruby_2_0_0/ext/curses/curses.c	(revision 40313)
@@ -2715,7 +2715,7 @@ Init_curses(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/curses/curses.c#L2715
     rb_define_module_function(mCurses, "noraw", curses_noraw, 0);
     rb_define_module_function(mCurses, "cbreak", curses_cbreak, 0);
     rb_define_module_function(mCurses, "nocbreak", curses_nocbreak, 0);
-    rb_define_module_function(mCurses, "crmode", curses_cbreak, 0);
+    rb_define_module_function(mCurses, "crmode", curses_nocbreak, 0);
     rb_define_module_function(mCurses, "nocrmode", curses_nocbreak, 0);
     rb_define_module_function(mCurses, "nl", curses_nl, 0);
     rb_define_module_function(mCurses, "nonl", curses_nonl, 0);
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40312)
+++ ruby_2_0_0/version.h	(revision 40313)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-16"
-#define RUBY_PATCHLEVEL 138
+#define RUBY_PATCHLEVEL 139
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_0_0/test/test_curses.rb
===================================================================
--- ruby_2_0_0/test/test_curses.rb	(revision 40312)
+++ ruby_2_0_0/test/test_curses.rb	(revision 40313)
@@ -1,9 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_curses.rb#L1
 require 'test/unit'
-require_relative 'ruby/envutil'
 
 begin
   require 'curses'
-  require 'pty'
 rescue LoadError
 end
 
@@ -12,49 +10,3 @@ class TestCurses < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_curses.rb#L10
     assert_instance_of(String, Curses::VERSION)
   end
 end if defined? Curses
-
-class TestCurses
-  def run_curses(src, input = nil, timeout: 1)
-    PTY.spawn(EnvUtil.rubybin, "-e", <<-"src") {|r, w, pid|
-require 'timeout'
-require 'curses'
-include Curses
-init_screen
-begin
-  result = Timeout.timeout(#{timeout}) do
-    #{src}
-  end
-rescue Exception => e
-ensure
-  close_screen
-  puts "", [Marshal.dump([result, e])].pack('m').delete("\n")
-end
-src
-      if input
-        w.print(input)
-        w.flush
-      end
-      res = r.read
-      return unless res
-      res, error = Marshal.load(res[/(.*)\Z/, 1].unpack('m')[0])
-      raise error if error
-      return res
-    }
-  end
-
-  def test_getch
-    assert_equal("a", run_curses("getch", "a"))
-  end
-  def test_getch_cbreak
-    assert_equal("a", run_curses("cbreak; getch", "a"))
-  end
-  def test_getch_nocbreak
-    assert_raise(Timeout::Error) {run_curses("nocbreak; getch", "a")}
-  end
-  def test_getch_crmode
-    assert_equal("a", run_curses("crmode; getch", "a"))
-  end
-  def test_getch_nocrmode
-    assert_raise(Timeout::Error) {run_curses("nocrmode; getch", "a")}
-  end
-end if defined? TestCurses and defined? PTY

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /trunk:r40117-40118


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