Merge pull request #62 from tarasko/bugfix/57_native_send_no_disconnect

Plain WSTransport.send doesn't produce 'disconnected' event in case of errors

This PR fixes #57

Author: tarasko

picows/picows.pyx

@@ -180,38 +180,6 @@ cdef class WSUpgradeResponseWithListener:
         self.listener = listener
 
 
-cdef _raise_from_errno(int ec):
-    cdef str reason = strerror(ec).decode()
-
-    exc = OSError
-
-    if ec in (errno.EACCES, errno.EPERM):
-        exc = PermissionError
-    elif ec in (errno.EAGAIN, errno.EALREADY, EWOULDBLOCK):
-        exc = BlockingIOError
-    elif ec in (errno.EPIPE, ESHUTDOWN):
-        exc = BrokenPipeError
-    elif ec == errno.ECONNABORTED:
-        exc = ConnectionAbortedError
-    elif ec == errno.ECONNREFUSED:
-        exc = ConnectionRefusedError
-    elif ec == errno.ECONNRESET:
-        exc = ConnectionResetError
-    elif ec == errno.EEXIST:
-        exc = FileExistsError
-    elif ec == errno.ENOENT:
-        exc = FileNotFoundError
-    elif ec == errno.EINTR:
-        exc = InterruptedError
-    elif ec == errno.EISDIR:
-        exc = IsADirectoryError
-    elif ec == errno.ESRCH:
-        exc = ProcessLookupError
-    elif ec == errno.ETIMEDOUT:
-        exc = TimeoutError
-    raise exc(ec, reason)
-
-
 cdef void _mask_payload(uint8_t* input, Py_ssize_t input_len, uint32_t mask) noexcept:
     # According to perf, _mask_payload is very fast and is not worth spending
     # any time optimizing it further.
@@ -860,12 +828,9 @@ cdef class WSTransport:
             self.underlying_transport.write(PyBytes_FromStringAndSize(<char*> ptr + bytes_written, sz - bytes_written))
             return
 
-        cdef int ec = picows_get_errno()
-        if ec == errno.EAGAIN or ec == EWOULDBLOCK:
-            self.underlying_transport.write(PyBytes_FromStringAndSize(<char *> ptr, sz))
-            return
-
-        _raise_from_errno(ec)
+        # In case of errors we ask asyncio to try sending again.
+        # Asyncio will try and based on error code may report 'disconnected' event.
+        self.underlying_transport.write(PyBytes_FromStringAndSize(<char *> ptr, sz))
 
 
 cdef class WSProtocol:

tests/test_basics.py

@@ -486,17 +486,3 @@ async def test_stress(client_msg_queue):
             frame = await client_msg_queue.get_message()
 
     assert not client_msg_queue.is_paused
-
-
-async def test_native_exc_conversion(client_msg_queue):
-    if client_msg_queue.transport.is_secure:
-        pytest.skip("skipped for secure connections")
-
-    # ask server to disconnect us
-    client_msg_queue.transport.send(WSMsgType.TEXT, b"disconnect_me_without_close_frame")
-    await asyncio.sleep(0.1)
-    msg = os.urandom(256)
-    with pytest.raises(OSError):
-        client_msg_queue.transport.send(picows.WSMsgType.BINARY, msg)
-        await asyncio.sleep(0.1)
-        client_msg_queue.transport.send(picows.WSMsgType.BINARY, msg)