Fixed test to reflect new filedispatcher semantics, as well as two

NameErrors pointed out by Giampaolo.

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 184c993d5e54b0e1a6b82a751274caaeeeafeb6c..305d8957dea19f4a0a1448ac42c87b80f635e9fe 100644 (file)
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -228,7 +228,7 @@ class dispatcher:
             # passed be connected.
             try:
                 self.addr = sock.getpeername()
-            except socket.error:
+            except socket.error, err:
                 if err[0] == ENOTCONN:
                     # To handle the case where we got an unconnected
                     # socket.
@@ -424,7 +424,7 @@ class dispatcher:
             #check for errors
             err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
             if err != 0:
-                raise socket.error(err, strerror(err))
+                raise socket.error(err, _strerror(err))
 
             self.handle_connect_event()
         self.handle_write()

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index eead905f076ee0b9094c5ffca030dd1f278d9297..dc4e5d0c5545d35257938c5b4561bfcb4784553b 100644 (file)
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -384,8 +384,8 @@ if hasattr(asyncore, 'file_wrapper'):
             fd = os.open(TESTFN, os.O_RDONLY)\r
             w = asyncore.file_wrapper(fd)\r
 \r
-            self.assertEqual(w.fd, fd)\r
-            self.assertEqual(w.fileno(), fd)\r
+            self.assertNotEqual(w.fd, fd)\r
+            self.assertNotEqual(w.fileno(), fd)\r
             self.assertEqual(w.recv(13), "It's not dead")\r
             self.assertEqual(w.read(6), ", it's")\r
             w.close()\r