fix issue 658749: correctly interprets asyncore's windows errors on connect()
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 874f101..edb1c7b 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -53,7 +53,7 @@
import warnings
import os
-from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
+from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, EINVAL, \
ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, errorcode
try:
@@ -337,8 +337,8 @@
def connect(self, address):
self.connected = False
err = self.socket.connect_ex(address)
- # XXX Should interpret Winsock return values
- if err in (EINPROGRESS, EALREADY, EWOULDBLOCK):
+ if err in (EINPROGRESS, EALREADY, EWOULDBLOCK) \
+ or err == EINVAL and os.name in ('nt', 'ce'):
return
if err in (0, EISCONN):
self.addr = address
diff --git a/Misc/NEWS b/Misc/NEWS
index 75375ab..dbfdae5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,9 @@
Library
-------
+- Issue #658749: asyncore's connect() method now correctly interprets winsock
+ errors;
+
- Issue #9501: Fixed logging regressions in cleanup code.
- Fix functools.total_ordering() to actually work.