compatibility with aiohttp>=3.8

Author: mosquito

pytest.ini

@@ -2,3 +2,4 @@
 python_files = test_*
 python_functions = test_*
 python_classes = TestSuite*
+asyncio_mode=auto

setup.py

@@ -31,11 +31,10 @@
         "Operating System :: Microsoft",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
     long_description=open("README.md").read(),

tests/conftest.py

@@ -22,10 +22,12 @@ def application(handler, socket_path):
 
 
 @pytest.fixture
-async def session(aiohttp_client, application, loop) -> ClientSession:
+async def session(aiohttp_client, application, event_loop) -> ClientSession:
     return await aiohttp_client(application)
 
 
 @pytest.fixture
-async def client(session: ClientSession, socket_path, loop) -> WSRPCClient:
-    return WSRPCClient(socket_path, session=session, loop=loop)
+async def client(
+    session: ClientSession, socket_path, event_loop
+) -> WSRPCClient:
+    return WSRPCClient(socket_path, session=session, loop=event_loop)

tests/test_events.py

@@ -5,11 +5,11 @@ async def emitter(socket: WSRPCBase):
     await socket.emit({"Hello": "world"})
 
 
-async def test_emitter(client: WSRPCClient, handler, loop):
+async def test_emitter(client: WSRPCClient, handler, event_loop):
     handler.add_route("emitter", emitter)
 
     async with client:
-        future = loop.create_future()
+        future = event_loop.create_future()
 
         client.add_event_listener(future.set_result)
 

tests/test_route.py

@@ -102,23 +102,21 @@ def foobar(self):
     assert "foobar" not in FooRoute.__no_proxy__
 
 
-def test_route__init__(loop):
+async def test_route__init__(event_loop):
     socket = Mock()
-    socket._loop = object()
-
     route = Route(socket)
 
     assert route.socket is socket
-    assert route.loop is socket._loop
+    assert route.loop is event_loop
 
     socket = object()
     route = Route(socket)
 
     assert route.socket is socket
-    assert route.loop is loop
+    assert route.loop is event_loop
 
 
-def test_abc_inheritance(loop):
+def test_abc_inheritance(event_loop):
     class AbstractMixin(ABC):
         @abstractmethod
         def foo(self):

tests/test_rpc_route.py

@@ -151,10 +151,10 @@ async def test_call_when_params_none(
 
 
 async def test_broadcast(
-    client: WSRPCClient, handler: WebSocketAsync, route: Route, loop
+    client: WSRPCClient, handler: WebSocketAsync, route: Route, event_loop
 ):
     async with client:
-        future = loop.create_future()
+        future = event_loop.create_future()
 
         async def on_broadcast(_, result):
             nonlocal future
@@ -229,7 +229,7 @@ def get_data(self, _):
 
 async def test_call_timeout(client: WSRPCClient, handler: WebSocketAsync):
     async def will_sleep_for(_, seconds):
-        with timeout(0.5):
+        async with timeout(0.5):
             await asyncio.sleep(seconds)
             return DATA_TO_RETURN
 

wsrpc_aiohttp/websocket/route.py

@@ -2,7 +2,7 @@
 import logging
 from abc import ABCMeta
 from types import MappingProxyType
-from typing import Any, Callable, Mapping
+from typing import Any, Callable, Mapping, Optional
 
 from . import decorators
 from .abc import AbstractRoute, AbstractWebSocket
@@ -63,17 +63,16 @@ class RouteBase(AbstractRoute, metaclass=RouteMeta):
     def __init__(self, socket: AbstractWebSocket):
         super().__init__(socket)
         self.__socket = socket
-        self.__loop = getattr(self.socket, "_loop") or asyncio.get_event_loop()
-
-        if self.__loop is None:
-            self.__loop = asyncio.get_event_loop()
+        self.__loop: Optional[asyncio.AbstractEventLoop] = None
 
     @property
     def socket(self) -> AbstractWebSocket:
         return self.__socket
 
     @property
     def loop(self) -> asyncio.AbstractEventLoop:
+        if self.__loop is None:
+            self.__loop = asyncio.get_running_loop()
         return self.__loop
 
     def _onclose(self):