naruse	2012-05-05 01:14:51 +0900 (Sat, 05 May 2012)

  New Revision: 35538

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

  Log:
    * io.c (parse_mode_enc): remove warnings 'Ignoring internal encoding'.
      [ruby-core:44455] [Bug #6324]
    
    * io.c (io_encoding_set): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/io.c
    trunk/test/ruby/test_io_m17n.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35537)
+++ ChangeLog	(revision 35538)
@@ -1,3 +1,10 @@
+Sat May  5 00:53:55 2012  NARUSE, Yui  <naruse@r...>
+
+	* io.c (parse_mode_enc): remove warnings 'Ignoring internal encoding'.
+	  [ruby-core:44455] [Bug #6324]
+
+	* io.c (io_encoding_set): ditto.
+
 Fri May  4 07:19:02 2012  NARUSE, Yui  <naruse@r...>
 
 	* lib/rdoc/parser.rb (RDoc.binary?): fix wrong regexp.
Index: io.c
===================================================================
--- io.c	(revision 35537)
+++ io.c	(revision 35538)
@@ -4712,7 +4712,6 @@
 	    if (idx2 < 0)
 		unsupported_encoding(p);
 	    else if (idx2 == idx) {
-		rb_warn("Ignoring internal encoding %s: it is identical to external encoding %s", p, estr);
 		int_enc = (rb_encoding *)Qnil;
 	    }
 	    else
@@ -8788,8 +8787,6 @@
 	    if (enc == enc2) {
 		/* Special case - "-" => no transcoding */
 		VALUE tmp1 = rb_check_string_type(v1);
-		rb_warn("Ignoring internal encoding %s: it is identical to external encoding %s",
-			StringValueCStr(tmp), NIL_P(tmp1) ? rb_enc_name(enc) : StringValueCStr(tmp1));
 		enc2 = NULL;
 	    }
 	}
@@ -8798,8 +8795,6 @@
 	    if (enc == enc2) {
 		/* Special case - "-" => no transcoding */
 		VALUE tmp1 = rb_check_string_type(v1);
-		rb_warn("Ignoring internal encoding %s: it is identical to external encoding %s",
-			rb_enc_name(enc), NIL_P(tmp1) ? rb_enc_name(enc) : StringValueCStr(tmp1));
 		enc2 = NULL;
 	    }
 	}
Index: test/ruby/test_io_m17n.rb
===================================================================
--- test/ruby/test_io_m17n.rb	(revision 35537)
+++ test/ruby/test_io_m17n.rb	(revision 35538)
@@ -985,26 +985,27 @@
   end
 
   def test_set_encoding_identical
-    bug5568 = '[ruby-core:40727]'
+    #bug5568 = '[ruby-core:40727]'
+    bug6324 = '[ruby-core:44455]'
     open(__FILE__, "r") do |f|
-      assert_warn(/Ignoring internal encoding euc-jp: it is identical to external encoding eucjp/, bug5568) {
+      assert_warn('', bug6324) {
         f.set_encoding("eucjp:euc-jp")
       }
-      assert_warn(/Ignoring internal encoding euc-jp: it is identical to external encoding eucjp/, bug5568) {
+      assert_warn('', bug6324) {
         f.set_encoding("eucjp", "euc-jp")
       }
-      assert_warn(/Ignoring internal encoding euc-jp: it is identical to external encoding EUC-JP/, bug5568) {
+      assert_warn('', bug6324) {
         f.set_encoding(Encoding::EUC_JP, "euc-jp")
       }
-      assert_warn(/Ignoring internal encoding EUC-JP: it is identical to external encoding eucjp/, bug5568) {
+      assert_warn('', bug6324) {
         f.set_encoding("eucjp", Encoding::EUC_JP)
       }
-      assert_warn(/Ignoring internal encoding EUC-JP: it is identical to external encoding EUC-JP/, bug5568) {
+      assert_warn('', bug6324) {
         f.set_encoding(Encoding::EUC_JP, Encoding::EUC_JP)
       }
       nonstr = Object.new
       def nonstr.to_str; "eucjp"; end
-      assert_warn(/Ignoring internal encoding eucjp: it is identical to external encoding eucjp/, bug5568) {
+      assert_warn('', bug6324) {
         f.set_encoding(nonstr, nonstr)
       }
     end

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