Merge branch 'pr399'

gevent/_socket3.py

 # Port of Python 3.3's socket module to gevent
 
 import io
+import sys
 import time
 from gevent import _socketcommon
 import _socket
@@ -65,7 +66,11 @@ class socket(object):
         # Only defined under Linux
         @property
         def type(self):
-            return self._sock.type & ~_socket.SOCK_NONBLOCK
+            # See https://github.com/gevent/gevent/pull/399
+            if self.timeout != 0.0:
+                return self._sock.type & ~_socket.SOCK_NONBLOCK
+            else:
+                return self._sock.type
 
     def __enter__(self):
         return self
@@ -375,8 +380,24 @@ class socket(object):
             self.hub.cancel_wait(self._write_event, cancel_wait_ex)
         self._sock.shutdown(how)
 
-
-SocketType = socket
+if sys.version_info[:2] == (3, 4) and sys.version_info[:3] <= (3, 4, 2):
+    # Python 3.4, up to and including 3.4.2, had a bug where the
+    # SocketType enumeration overwrote the SocketType class imported
+    # from _socket. This was fixed in 3.4.3 (http://bugs.python.org/issue20386
+    # and https://github.com/python/cpython/commit/0d2f85f38a9691efdfd1e7285c4262cab7f17db7).
+    # Prior to that, if we replace SocketType with our own class, the implementation
+    # of socket.type breaks with "OSError: [Errno 97] Address family not supported by protocol".
+    # Therefore, on these old versions, we must preserve it as an enum; while this
+    # seems like it could lead to non-green behaviour, code on those versions
+    # cannot possibly be using SocketType as a class anyway.
+    SocketType = __socket__.SocketType
+    # Fixup __all__; note that we get exec'd multiple times during unit tests
+    if 'SocketType' in __implements__:
+        __implements__.remove('SocketType')
+    if 'SocketType' not in __imports__:
+        __imports__.append('SocketType')
+else:
+    SocketType = socket
 
 
 def fromfd(fd, family, type, proto=0):

greentest/test__socket.py

@@ -195,6 +195,11 @@ class TestTCP(greentest.TestCase):
             s.settimeout(1)
             self.assertEqual(socket.AF_INET, s.type)
 
+            s.setblocking(0)
+            std_socket = monkey.get_original('socket', 'socket')(socket.AF_INET, socket.SOCK_DGRAM, 0)
+            std_socket.setblocking(0)
+            self.assertEqual(std_socket.type, s.type)
+
 
 def get_port():
     tempsock = socket.socket()