Address deprecations (Fixes #422)

Author: miguelgrinberg

examples/client/asyncio/latency_client.py

@@ -2,7 +2,6 @@
 import time
 import engineio
 
-loop = asyncio.get_event_loop()
 eio = engineio.AsyncClient()
 start_timer = None
 
@@ -33,4 +32,4 @@ async def start_client():
 
 
 if __name__ == '__main__':
-    loop.run_until_complete(start_client())
+    asyncio.run(start_client())

examples/client/asyncio/simple_client.py

@@ -2,7 +2,6 @@
 import signal
 import engineio
 
-loop = asyncio.get_event_loop()
 eio = engineio.AsyncClient()
 exit_event = asyncio.Event()
 original_signal_handler = None
@@ -50,4 +49,4 @@ async def start_client():
 
 if __name__ == '__main__':
     original_signal_handler = signal.signal(signal.SIGINT, signal_handler)
-    loop.run_until_complete(start_client())
+    asyncio.run(start_client())

examples/server/aiohttp/latency.py

@@ -22,4 +22,4 @@ async def message(sid, data):
 
 
 if __name__ == '__main__':
-    web.run_app(app)
+    web.run_app(app, port=5001)

src/engineio/async_client.py

@@ -1,5 +1,6 @@
 import asyncio
 from http.cookies import SimpleCookie
+import inspect
 import signal
 import ssl
 import threading
@@ -328,7 +329,8 @@ async def _connect_websocket(self, url, headers, engineio_path):
                 del headers[header]
                 break
 
-        extra_options = {'timeout': self.request_timeout}
+        extra_options = {
+            'timeout': aiohttp.ClientWSTimeout(ws_close=self.request_timeout)}
         if not self.ssl_verify:
             ssl_context = ssl.create_default_context()
             ssl_context.check_hostname = False
@@ -468,7 +470,7 @@ async def _trigger_event(self, event, *args, **kwargs):
         run_async = kwargs.pop('run_async', False)
         ret = None
         if event in self.handlers:
-            if asyncio.iscoroutinefunction(self.handlers[event]) is True:
+            if inspect.iscoroutinefunction(self.handlers[event]) is True:
                 if run_async:
                     task = self.start_background_task(self.handlers[event],
                                                       *args)

src/engineio/async_drivers/aiohttp.py

@@ -1,4 +1,4 @@
-import asyncio
+import inspect
 import sys
 
 from aiohttp.web import Response, WebSocketResponse
@@ -98,7 +98,7 @@ async def send(self, message):
             f = self._sock.send_bytes
         else:
             f = self._sock.send_str
-        if asyncio.iscoroutinefunction(f):
+        if inspect.iscoroutinefunction(f):
             await f(message)
         else:
             f(message)

src/engineio/async_drivers/asgi.py

@@ -1,6 +1,6 @@
+import inspect
 import os
 import sys
-import asyncio
 
 from engineio.static_files import get_static_file
 
@@ -102,7 +102,7 @@ async def lifespan(self, scope, receive, send):
                 if self.on_startup:
                     try:
                         await self.on_startup() \
-                            if asyncio.iscoroutinefunction(self.on_startup) \
+                            if inspect.iscoroutinefunction(self.on_startup) \
                             else self.on_startup()
                     except:
                         await send({'type': 'lifespan.startup.failed'})
@@ -112,7 +112,7 @@ async def lifespan(self, scope, receive, send):
                 if self.on_shutdown:
                     try:
                         await self.on_shutdown() \
-                            if asyncio.iscoroutinefunction(self.on_shutdown) \
+                            if inspect.iscoroutinefunction(self.on_shutdown) \
                             else self.on_shutdown()
                     except:
                         await send({'type': 'lifespan.shutdown.failed'})

src/engineio/async_drivers/tornado.py

@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import sys
 from urllib.parse import urlsplit
 from .. import exceptions
@@ -24,7 +25,7 @@ def __init__(self, *args, **kwargs):
         async def get(self, *args, **kwargs):
             if self.request.headers.get('Upgrade', '').lower() == 'websocket':
                 ret = super().get(*args, **kwargs)
-                if asyncio.iscoroutine(ret):
+                if inspect.iscoroutine(ret):
                     await ret
             else:
                 await engineio_server.handle_request(self)

src/engineio/async_server.py

@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import urllib
 
 from . import base_server
@@ -212,7 +213,7 @@ async def handle_request(self, *args, **kwargs):
         Note: this method is a coroutine.
         """
         translate_request = self._async['translate_request']
-        if asyncio.iscoroutinefunction(translate_request):
+        if inspect.iscoroutinefunction(translate_request):
             environ = await translate_request(*args, **kwargs)
         else:
             environ = translate_request(*args, **kwargs)
@@ -427,7 +428,7 @@ def create_event(self, *args, **kwargs):
     async def _make_response(self, response_dict, environ):
         cors_headers = self._cors_headers(environ)
         make_response = self._async['make_response']
-        if asyncio.iscoroutinefunction(make_response):
+        if inspect.iscoroutinefunction(make_response):
             response = await make_response(
                 response_dict['status'],
                 response_dict['headers'] + cors_headers,
@@ -502,7 +503,7 @@ async def _trigger_event(self, event, *args, **kwargs):
         run_async = kwargs.pop('run_async', False)
         ret = None
         if event in self.handlers:
-            if asyncio.iscoroutinefunction(self.handlers[event]):
+            if inspect.iscoroutinefunction(self.handlers[event]):
                 async def run_async_handler():
                     try:
                         try:

tests/async/test_client.py

@@ -24,6 +24,10 @@ def mock_queue(self, client):
         client.queue.put = mock.AsyncMock()
         client.queue.join = mock.AsyncMock()
 
+    @staticmethod
+    def mock_ws_timeout(ws_close):
+        return ws_close
+
     async def test_is_asyncio_based(self):
         c = async_client.AsyncClient()
         assert c.is_asyncio_based()
@@ -500,6 +504,8 @@ async def test_polling_connection_not_upgraded(self):
         assert c in base_client.connected_clients
 
     @mock.patch('engineio.client.time.time', return_value=123.456)
+    @mock.patch('engineio.async_client.aiohttp.ClientWSTimeout',
+                new=mock_ws_timeout)
     async def test_websocket_connection_failed(self, _time):
         c = async_client.AsyncClient()
         c.http = mock.MagicMock(closed=False)
@@ -541,6 +547,8 @@ async def test_websocket_connection_extra(self, _time):
         )
 
     @mock.patch('engineio.client.time.time', return_value=123.456)
+    @mock.patch('engineio.async_client.aiohttp.ClientWSTimeout',
+                new=mock_ws_timeout)
     async def test_websocket_upgrade_failed(self, _time):
         c = async_client.AsyncClient()
         c.http = mock.MagicMock(closed=False)
@@ -568,6 +576,8 @@ async def test_websocket_connection_no_open_packet(self):
             await c.connect('http://foo', transports=['websocket'])
 
     @mock.patch('engineio.client.time.time', return_value=123.456)
+    @mock.patch('engineio.async_client.aiohttp.ClientWSTimeout',
+                new=mock_ws_timeout)
     async def test_websocket_connection_successful(self, _time):
         c = async_client.AsyncClient()
         c.http = mock.MagicMock(closed=False)
@@ -649,6 +659,8 @@ async def test_websocket_https_noverify_connection_successful(self, _time):
         assert kwargs['ssl'].verify_mode == ssl.CERT_NONE
 
     @mock.patch('engineio.client.time.time', return_value=123.456)
+    @mock.patch('engineio.async_client.aiohttp.ClientWSTimeout',
+                new=mock_ws_timeout)
     async def test_websocket_connection_with_cookies(self, _time):
         c = async_client.AsyncClient()
         c.http = mock.MagicMock(closed=False)
@@ -682,6 +694,8 @@ async def test_websocket_connection_with_cookies(self, _time):
         )
 
     @mock.patch('engineio.client.time.time', return_value=123.456)
+    @mock.patch('engineio.async_client.aiohttp.ClientWSTimeout',
+                new=mock_ws_timeout)
     async def test_websocket_connection_with_cookie_header(self, _time):
         c = async_client.AsyncClient()
         c.http = mock.MagicMock(closed=False)
@@ -718,6 +732,8 @@ async def test_websocket_connection_with_cookie_header(self, _time):
         )
 
     @mock.patch('engineio.client.time.time', return_value=123.456)
+    @mock.patch('engineio.async_client.aiohttp.ClientWSTimeout',
+                new=mock_ws_timeout)
     async def test_websocket_connection_with_cookies_and_headers(self, _time):
         c = async_client.AsyncClient()
         c.http = mock.MagicMock(closed=False)