make websockets compatible with python3.10

Signed-off-by: Harmouch101 <[email protected]>

Author: wiseaidev

setup.py

@@ -87,7 +87,7 @@
         "requests>=2.16.0,<3.0.0",
         # remove typing_extensions after python_requires>=3.8, see web3._utils.compat
         "typing-extensions>=3.7.4.1,<4;python_version<'3.8'",
-        "websockets>=9.1,<10",
+        "websockets>=9.1,<=10.0",
     ],
     python_requires='>=3.6,<4',
     extras_require=extras_require,

tests/core/providers/test_websocket_provider.py

@@ -17,6 +17,9 @@
 from web3.providers.websocket import (
     WebsocketProvider,
 )
+from web3.providers.websockets_compatibility import (
+    loop_if_py_lt_38,
+)
 
 if sys.version_info >= (3, 8):
     from asyncio.exceptions import (
@@ -37,7 +40,7 @@ async def empty_server(websocket, path):
             data = await websocket.recv()
             await asyncio.sleep(0.02)
             await websocket.send(data)
-        server = websockets.serve(empty_server, '127.0.0.1', open_port, loop=event_loop)
+        server = websockets.serve(empty_server, '127.0.0.1', open_port, **loop_if_py_lt_38(event_loop))
         event_loop.run_until_complete(server)
         event_loop.run_forever()
 

tests/utils.py

@@ -4,6 +4,9 @@
 
 import websockets
 
+from web3.providers.websockets_compatibility import (
+    loop_if_py_lt_38,
+)
 
 def get_open_port():
     sock = socket.socket()
@@ -17,7 +20,7 @@ async def wait_for_ws(endpoint_uri, event_loop, timeout=60):
     start = time.time()
     while time.time() < start + timeout:
         try:
-            async with websockets.connect(uri=endpoint_uri, loop=event_loop):
+            async with websockets.connect(uri=endpoint_uri, **loop_if_py_lt_38(event_loop)):
                 pass
         except (ConnectionRefusedError, OSError):
             await asyncio.sleep(0.01)

web3/providers/websocket.py

@@ -35,6 +35,7 @@
     RPCEndpoint,
     RPCResponse,
 )
+from .websockets_compatibility import loop_if_py_lt_38
 
 RESTRICTED_WEBSOCKET_KWARGS = {'uri', 'loop'}
 DEFAULT_WEBSOCKET_TIMEOUT = 10
@@ -70,7 +71,7 @@ def __init__(
     async def __aenter__(self) -> WebSocketClientProtocol:
         if self.ws is None:
             self.ws = await connect(
-                uri=self.endpoint_uri, loop=self.loop, **self.websocket_kwargs
+                uri=self.endpoint_uri, **loop_if_py_lt_38(self.loop), **self.websocket_kwargs
             )
         return self.ws
 

web3/providers/websockets_compatibility.py

@@ -0,0 +1,10 @@
+import asyncio
+import sys
+from typing import Any, Dict
+
+
+def loop_if_py_lt_38(loop: asyncio.AbstractEventLoop) -> Dict[str, Any]:
+    """
+    Helper for the removal of the loop argument in Python 3.10.
+    """
+    return {"loop": loop} if sys.version_info[:2] < (3, 8) else {}