[Zodb-checkins] CVS: ZODB3/ZEO/zrpc - client.py:1.9.2.1

Jeremy Hylton jeremy@zope.com
Thu, 12 Sep 2002 17:55:11 -0400


Update of /cvs-repository/ZODB3/ZEO/zrpc
In directory cvs.zope.org:/tmp/cvs-serv20577

Modified Files:
      Tag: ZODB3-3_1-branch
	client.py 
Log Message:
Backport fix from trunk: Fix for Win2K: add errno.WSAEINVAL to
_CONNECT_OK.


=== ZODB3/ZEO/zrpc/client.py 1.9 => 1.9.2.1 ===
--- ZODB3/ZEO/zrpc/client.py:1.9	Thu Sep 12 00:02:18 2002
+++ ZODB3/ZEO/zrpc/client.py	Thu Sep 12 17:55:10 2002
@@ -184,7 +184,8 @@
 # already connected (our code can attempt redundant connects).
 if hasattr(errno, "WSAEWOULDBLOCK"):    # Windows
     _CONNECT_IN_PROGRESS = (errno.WSAEWOULDBLOCK,)
-    _CONNECT_OK          = (0, errno.WSAEISCONN)
+    # Win98: WSAEISCONN; Win2K: WSAEINVAL
+    _CONNECT_OK          = (0, errno.WSAEISCONN, errno.WSAEINVAL)
 else:                                   # Unix
     _CONNECT_IN_PROGRESS = (errno.EINPROGRESS,)
     _CONNECT_OK          = (0, errno.EISCONN)