From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Fri, 13 Aug 2010 01:30:39 +0000 (+0000)
Subject: (issue 2944) reverting r83704 changes as per Barry Warsaw request
X-Git-Tag: v2.6.6rc2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b07f3cbfc23d78628cd8d122640e036046f69d7;p=python

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

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 8b9ba8795a..b6eb67e1c6 100644
--- 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 d94790e10f..757bc1d90d 100644
--- 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 9d893b738f..fe60cbbe9f 100644
--- 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.