Merge pull request #31 from zopefoundation/8-windows_sock_stream

Fix connecting to 'localhost' on Windows / Solaris / Android.

CHANGES.rst

 Changelog
 =========
 
+4.2.1 (unreleased)
+------------------
+
+- Fix bug connecting to ``localhost`` on Windows. (#8).
+
 4.2.0 (2016-06-15)
 ------------------
 

src/ZEO/zrpc/client.py

@@ -29,7 +29,6 @@ from ZEO.zrpc.error import DisconnectedError
 from ZODB.POSException import ReadOnlyError
 from ZODB.loglevels import BLATHER
 from six.moves import map
-from six.moves import zip
 
 
 def client_timeout():
@@ -453,12 +452,10 @@ class ConnectThread(threading.Thread):
             if domain == socket.AF_INET:
                 host, port = addr
                 for (family, socktype, proto, cannoname, sockaddr
-                     ) in socket.getaddrinfo(host or 'localhost', port):
-                    # we only speak TCP, so let's skip UDP and RAW sockets
-                    # otherwise we'll try to connect to the same address
-                    # three times in a row
-                    if socktype != socket.SOCK_STREAM:
-                        continue
+                     ) in socket.getaddrinfo(host or 'localhost', port,
+                                             socket.AF_INET,
+                                             socket.SOCK_STREAM
+                                            ): # prune non-TCP results
                     # for IPv6, drop flowinfo, and restrict addresses
                     # to [host]:port
                     yield family, sockaddr[:2]