Don't use get_running_loop outside of coroutines.

get_event_loop() returns the running loop if there's one anyway.

Author: aaugustin

src/websockets/legacy/client.py

@@ -33,7 +33,6 @@
 from ..http import USER_AGENT, build_host
 from ..typing import ExtensionHeader, LoggerLike, Origin, Subprotocol
 from ..uri import WebSocketURI, parse_uri
-from .compatibility import asyncio_get_running_loop
 from .handshake import build_request, check_response
 from .http import read_response
 from .protocol import WebSocketCommonProtocol
@@ -517,7 +516,7 @@ def __init__(
         # Backwards compatibility: the loop parameter used to be supported.
         loop: Optional[asyncio.AbstractEventLoop] = kwargs.pop("loop", None)
         if loop is None:
-            loop = asyncio_get_running_loop()
+            loop = asyncio.get_event_loop()
         else:
             warnings.warn("remove loop argument", DeprecationWarning)
 

src/websockets/legacy/compatibility.py

@@ -9,14 +9,3 @@ def loop_if_py_lt_38(loop: asyncio.AbstractEventLoop) -> Dict[str, Any]:
 
     """
     return {"loop": loop} if sys.version_info[:2] < (3, 8) else {}
-
-
-def asyncio_get_running_loop() -> asyncio.AbstractEventLoop:
-    """
-    Helper for the deprecation of get_event_loop in Python 3.10.
-
-    """
-    if sys.version_info[:2] < (3, 10):  # pragma: no cover
-        return asyncio.get_event_loop()
-    else:  # pragma: no cover
-        return asyncio.get_running_loop()

src/websockets/legacy/server.py

@@ -42,7 +42,7 @@
 from ..headers import build_extension, parse_extension, parse_subprotocol
 from ..http import USER_AGENT
 from ..typing import ExtensionHeader, LoggerLike, Origin, Subprotocol
-from .compatibility import asyncio_get_running_loop, loop_if_py_lt_38
+from .compatibility import loop_if_py_lt_38
 from .handshake import build_response, check_request
 from .http import read_request
 from .protocol import WebSocketCommonProtocol
@@ -1026,7 +1026,7 @@ def __init__(
         # Backwards compatibility: the loop parameter used to be supported.
         loop: Optional[asyncio.AbstractEventLoop] = kwargs.pop("loop", None)
         if loop is None:
-            loop = asyncio_get_running_loop()
+            loop = asyncio.get_event_loop()
         else:
             warnings.warn("remove loop argument", DeprecationWarning)