matz	2007-11-14 16:03:39 +0900 (Wed, 14 Nov 2007)

  New Revision: 13922

  Modified files:
    trunk/ChangeLog
    trunk/test/socket/test_socket.rb
    trunk/test/strscan/test_stringscanner.rb

  Log:
    * test/socket/test_socket.rb: update not to use 1.8 assignment to
      external local variable in the block parameters.  [ruby-dev:32251]
    
    * test/strscan/test_stringscanner.rb: avoid $KCODE, and use
      String#force_encoding().  [ruby-dev:32251]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/socket/test_socket.rb?r1=13922&r2=13921
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13922&r2=13921
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/strscan/test_stringscanner.rb?r1=13922&r2=13921

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13921)
+++ ChangeLog	(revision 13922)
@@ -1,3 +1,11 @@
+Wed Nov 14 15:39:24 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* test/socket/test_socket.rb: update not to use 1.8 assignment to
+	  external local variable in the block parameters.  [ruby-dev:32251]
+
+	* test/strscan/test_stringscanner.rb: avoid $KCODE, and use
+	  String#force_encoding().  [ruby-dev:32251]
+
 Wed Nov 14 14:04:42 2007  Tanaka Akira  <akr@f...>
 
 	* common.mk, Makefile.in: rename prelude.c to miniprelude.c.
Index: test/socket/test_socket.rb
===================================================================
--- test/socket/test_socket.rb	(revision 13921)
+++ test/socket/test_socket.rb	(revision 13922)
@@ -38,7 +38,8 @@
       s.close
       linger
     }
-    inet_stream do |s|
+    inet_stream do |sock|
+      s = sock
       assert_equal(0, s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger))
 
       assert_raise(IOError) {
@@ -51,7 +52,8 @@
       s.close
       Socket::SO_LINGER
     }
-    inet_stream do |s|
+    inet_stream do |sock|
+      s = sock
       assert_raise(IOError) {
         s.setsockopt(Socket::SOL_SOCKET, val, linger)
       }
@@ -65,7 +67,8 @@
       s.close
       2
     }
-    inet_stream do |s|
+    inet_stream do |sock|
+      s = sock
       assert_raise(IOError) {
         s.listen(log)
       }
Index: test/strscan/test_stringscanner.rb
===================================================================
--- test/strscan/test_stringscanner.rb	(revision 13921)
+++ test/strscan/test_stringscanner.rb	(revision 13922)
@@ -288,15 +288,9 @@
     assert_equal true, s.getch.tainted?
     assert_nil s.getch
 
-    kc_backup = $KCODE
-    begin
-      $KCODE = 'EUC'
-      s = StringScanner.new("\244\242")
-      assert_equal "\244\242", s.getch
-      assert_nil s.getch
-    ensure
-      $KCODE = kc_backup
-    end
+    s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+    assert_equal "\244\242", s.getch
+    assert_nil s.getch
 
     s = StringScanner.new('test')
     s.scan(/te/)
@@ -322,16 +316,10 @@
     assert_equal true, s.get_byte.tainted?
     assert_nil s.get_byte
 
-    kc_backup = $KCODE
-    begin
-      $KCODE = 'EUC'
-      s = StringScanner.new("\244\242")
-      assert_equal "\244", s.get_byte
-      assert_equal "\242", s.get_byte
-      assert_nil s.get_byte
-    ensure
-      $KCODE = kc_backup
-    end
+    s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+    assert_equal "\244", s.get_byte
+    assert_equal "\242", s.get_byte
+    assert_nil s.get_byte
 
     s = StringScanner.new('test')
     s.scan(/te/)
@@ -424,17 +412,10 @@
     assert_nil           s[0]
 
 
-    kc_backup = $KCODE
-    begin
-      $KCODE = 'EUC'
-      s = StringScanner.new("\244\242")
-      s.getch
-      assert_equal "\244\242", s[0]
-    ensure
-      $KCODE = kc_backup
-    end
+    s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+    s.getch
+    assert_equal "\244\242", s[0]
 
-
     str = 'test'
     str.taint
     s = StringScanner.new(str)

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