(issue 2944) reverting r83704 changes as per Barry Warsaw request

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 8b9ba8795a69b8213203af7ee7a055b9ad95a8db..b6eb67e1c6480c82e461caebb679525be5072be7 100644 (file)
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -428,9 +428,6 @@ class dispatcher:
             self.handle_read()
 
     def handle_connect_event(self):
-        err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
-        if err != 0:
-            raise socket.error(err, _strerror(err))
         self.handle_connect()
         self.connected = True
 

diff --git a/Misc/ACKS b/Misc/ACKS
index d94790e10f3102abe92df6d7447374a450e55224..757bc1d90d2190624f3721a5f0ceb388d93adc62 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -817,4 +817,3 @@ Tarek Ziad
 Peter Åstrand
 Jesse Noller
 Fredrik Håård
-Alexander Shigin

diff --git a/Misc/NEWS b/Misc/NEWS
index 9d893b738fe8a1474c871569a8a26d6974eb421e..fe60cbbe9f89d2aec5bf103f207861aa5aac325a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -109,8 +109,6 @@ C-API
 Library
 -------
 
-- Issue #2944: asyncore doesn't handle connection refused correctly.
-
 - Issue #8447: Make distutils.sysconfig follow symlinks in the path to
   the interpreter executable.  This fixes a failure of test_httpservers
   on OS X.