Move websockets from legacy to asyncio

src/onegov/websockets/cli.py

@@ -5,7 +5,7 @@
 
 import click
 from sentry_sdk import init as init_sentry
-from websockets.legacy.client import connect
+from websockets.asyncio.client import connect
 
 from onegov.core.cli import command_group, pass_group_context
 from onegov.websockets.client import authenticate

src/onegov/websockets/client.py

@@ -6,7 +6,7 @@
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from onegov.core.types import JSON_ro
-    from websockets.legacy.client import WebSocketClientProtocol
+    from websockets.client import WebSocketClientProtocol
 
 
 async def acknowledged(websocket: 'WebSocketClientProtocol') -> None:

src/onegov/websockets/integration.py

@@ -6,7 +6,7 @@
 from onegov.websockets.client import broadcast
 from urllib.parse import ParseResult
 from urllib.parse import urlparse
-from websockets.legacy.client import connect
+from websockets.asyncio.client import connect
 
 
 from typing import Any

src/onegov/websockets/server.py

@@ -11,8 +11,7 @@
 from itsdangerous import BadSignature, Signer
 from markupsafe import escape
 from websockets.exceptions import ConnectionClosed, InvalidOrigin
-from websockets.legacy.protocol import broadcast
-from websockets.legacy.server import WebSocketServerProtocol, serve
+from websockets.server import WebSocketServerProtocol, serve, broadcast
 
 from onegov.chat.collections import ChatCollection
 from onegov.chat.utils import param_from_path
@@ -30,7 +29,7 @@
 
     from sqlalchemy.orm import Session
     from websockets import Headers
-    from websockets.legacy.server import HTTPResponse
+    from websockets.asyncio.server import HTTPResponse
 
     from onegov.chat.models import Chat
     from onegov.core.types import JSONObject, JSONObject_ro

tests/onegov/websockets/test_browser.py

@@ -3,7 +3,7 @@
 from onegov.websockets.client import status
 from pytest import mark
 from tests.onegov.websockets.conftest import WebsocketsRoot
-from websockets import connect
+from websockets.asyncio.client import connect
 
 
 @mark.asyncio

tests/onegov/websockets/test_client_server.py

@@ -7,7 +7,7 @@
 from onegov.websockets.client import status
 from pytest import mark
 from pytest import raises
-from websockets import connect
+from websockets.asyncio.client import connect
 
 
 @mark.asyncio