Merge pull request #48 from ActiveState/BE-3962-python-2-core-async

Fix socket bugs caused by switching to a newer MSVC compiler

Author: icanhasmath

Lib/asyncore.py

@@ -55,10 +55,12 @@
 import os
 from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, EINVAL, \
      ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, EPIPE, EAGAIN, \
-     errorcode
+     errorcode, \
+     WSAEWOULDBLOCK, WSAENOTCONN, WSAEINPROGRESS, WSAEALREADY, WSAEISCONN, \
+     WSAECONNABORTED, WSAENOTCONN, WSAEBADF
 
 _DISCONNECTED = frozenset((ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED, EPIPE,
-                           EBADF))
+                           EBADF, WSAENOTCONN, WSAECONNABORTED, WSAEBADF))
 
 try:
     socket_map
@@ -249,7 +251,7 @@ def __init__(self, sock=None, map=None):
             try:
                 self.addr = sock.getpeername()
             except socket.error, err:
-                if err.args[0] in (ENOTCONN, EINVAL):
+                if err.args[0] in (ENOTCONN, EINVAL, WSAENOTCONN):
                     # To handle the case where we got an unconnected
                     # socket.
                     self.connected = False
@@ -345,7 +347,7 @@ def connect(self, address):
         self.connected = False
         self.connecting = True
         err = self.socket.connect_ex(address)
-        if err in (EINPROGRESS, EALREADY, EWOULDBLOCK) \
+        if err in (EINPROGRESS, EALREADY, EWOULDBLOCK, WSAEINPROGRESS, WSAEALREADY, WSAEWOULDBLOCK) \
         or err == EINVAL and os.name in ('nt', 'ce'):
             self.addr = address
             return
@@ -362,7 +364,7 @@ def accept(self):
         except TypeError:
             return None
         except socket.error as why:
-            if why.args[0] in (EWOULDBLOCK, ECONNABORTED, EAGAIN):
+            if why.args[0] in (EWOULDBLOCK, ECONNABORTED, EAGAIN, WSAEWOULDBLOCK, WSAECONNABORTED):
                 return None
             else:
                 raise
@@ -374,7 +376,7 @@ def send(self, data):
             result = self.socket.send(data)
             return result
         except socket.error, why:
-            if why.args[0] == EWOULDBLOCK:
+            if why.args[0] in(EWOULDBLOCK, WSAEWOULDBLOCK):
                 return 0
             elif why.args[0] in _DISCONNECTED:
                 self.handle_close()
@@ -408,7 +410,7 @@ def close(self):
         try:
             self.socket.close()
         except socket.error, why:
-            if why.args[0] not in (ENOTCONN, EBADF):
+            if why.args[0] not in (ENOTCONN, EBADF, WSAENOTCONN, WSAEBADF):
                 raise
 
     # cheap inheritance, used to pass all other attribute