summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodolà <g.rodola@gmail.com>2010-08-13 01:30:39 +0000
committerGiampaolo Rodolà <g.rodola@gmail.com>2010-08-13 01:30:39 +0000
commit668f5f5847247ec091ebc2eb718c34e963630e19 (patch)
treeed82e670f42136ec19c62134a46c56914db7f4ce
parent3f8b1900b1d3cd43c3fe4bf3d7ae2439fb499725 (diff)
downloadcpython-668f5f5847247ec091ebc2eb718c34e963630e19.tar.gz
(issue 2944) reverting r83704 changes as per Barry Warsaw request
-rw-r--r--Lib/asyncore.py3
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
3 files changed, 0 insertions, 6 deletions
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.