From 816aba88d6fc3eac52bb9b217edb17f04f0f015b Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 14 Nov 2007 07:03:39 +0000
Subject: * 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]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/socket/test_socket.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'test/socket')

diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index 2eba8a1cb..78e678c96 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -38,7 +38,8 @@ class TestBasicSocket < Test::Unit::TestCase
       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 @@ class TestBasicSocket < Test::Unit::TestCase
       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 @@ class TestBasicSocket < Test::Unit::TestCase
       s.close
       2
     }
-    inet_stream do |s|
+    inet_stream do |sock|
+      s = sock
       assert_raise(IOError) {
         s.listen(log)
       }
-- 
cgit