Merge branch 'master' into minor_cleanup_in_ssl_protocol

Author: tarasko

tests/test_context.py

@@ -512,9 +512,10 @@ async def write_over():
                         proto.transport.write(b'q' * 16384)
                         count += 1
                 else:
-                    proto.transport.write(b'q' * 16384)
                     proto.transport.set_write_buffer_limits(high=256, low=128)
-                    count += 1
+                    while not proto.transport.get_write_buffer_size():
+                        proto.transport.write(b'q' * 16384)
+                        count += 1
                 return count
 
             s = self.loop.run_in_executor(None, accept)

tests/test_tcp.py

@@ -1226,21 +1226,16 @@ def resume_writing(self):
             t, p = await self.loop.create_connection(Protocol, *addr)
 
             t.write(b'q' * 512)
-            self.assertEqual(t.get_write_buffer_size(), 512)
-
             t.set_write_buffer_limits(low=16385)
-            self.assertFalse(paused)
             self.assertEqual(t.get_write_buffer_limits(), (16385, 65540))
 
             with self.assertRaisesRegex(ValueError, 'high.*must be >= low'):
                 t.set_write_buffer_limits(high=0, low=1)
 
             t.set_write_buffer_limits(high=1024, low=128)
-            self.assertFalse(paused)
             self.assertEqual(t.get_write_buffer_limits(), (128, 1024))
 
             t.set_write_buffer_limits(high=256, low=128)
-            self.assertTrue(paused)
             self.assertEqual(t.get_write_buffer_limits(), (128, 256))
 
             t.close()

uvloop/handles/stream.pxd

@@ -1,11 +1,17 @@
+cdef enum ProtocolType:
+    SIMPLE = 0          # User Protocol doesn't support asyncio.BufferedProtocol
+    BUFFERED = 1        # User Protocol supports asyncio.BufferedProtocol
+    SSL_PROTOCOL = 2    # Our own SSLProtocol
+
+
 cdef class UVStream(UVBaseTransport):
     cdef:
         uv.uv_shutdown_t _shutdown_req
         bint __shutting_down
         bint __reading
         bint __read_error_close
 
-        bint __buffered
+        ProtocolType __protocol_type
         object _protocol_get_buffer
         object _protocol_buffer_updated
 
@@ -16,6 +22,8 @@ cdef class UVStream(UVBaseTransport):
         Py_buffer _read_pybuf
         bint _read_pybuf_acquired
 
+    cpdef write(self, object buf)
+
     # All "inline" methods are final
 
     cdef inline _init(self, Loop loop, object protocol, Server server,
@@ -39,8 +47,8 @@ cdef class UVStream(UVBaseTransport):
 
     # _exec_write() is the method that does the actual send, and _try_write()
     # is a fast-path used in _exec_write() to send a single chunk.
-    cdef inline _exec_write(self)
-    cdef inline _try_write(self, object data)
+    cdef inline bint _exec_write(self) except -1
+    cdef inline Py_ssize_t _try_write(self, object data) except -2
 
     cdef _close(self)