Move asyncio compatibility to a new package.

Author: aaugustin

pyproject.toml

@@ -47,8 +47,8 @@ branch = true
 omit = [
     # */websockets matches src/websockets and .tox/**/site-packages/websockets
     "*/websockets/__main__.py",
-    "*/websockets/legacy/async_timeout.py",
-    "*/websockets/legacy/compatibility.py",
+    "*/websockets/asyncio/async_timeout.py",
+    "*/websockets/asyncio/compatibility.py",
     "tests/maxi_cov.py",
 ]
 

src/websockets/asyncio/__init__.py

@@ -16,6 +16,7 @@
     cast,
 )
 
+from ..asyncio.compatibility import asyncio_timeout
 from ..datastructures import Headers, HeadersLike
 from ..exceptions import (
     InvalidHandshake,
@@ -40,7 +41,6 @@
 from ..http import USER_AGENT
 from ..typing import ExtensionHeader, LoggerLike, Origin, Subprotocol
 from ..uri import WebSocketURI, parse_uri
-from .compatibility import asyncio_timeout
 from .handshake import build_request, check_response
 from .http import read_response
 from .protocol import WebSocketCommonProtocol

src/websockets/legacy/async_timeout.py renamed to src/websockets/asyncio/async_timeout.py

@@ -23,6 +23,7 @@
     cast,
 )
 
+from ..asyncio.compatibility import asyncio_timeout
 from ..datastructures import Headers
 from ..exceptions import (
     ConnectionClosed,
@@ -49,7 +50,6 @@
 )
 from ..protocol import State
 from ..typing import Data, LoggerLike, Subprotocol
-from .compatibility import asyncio_timeout
 from .framing import Frame
 
 

src/websockets/legacy/compatibility.py renamed to src/websockets/asyncio/compatibility.py

@@ -21,6 +21,7 @@
     cast,
 )
 
+from ..asyncio.compatibility import asyncio_timeout
 from ..datastructures import Headers, HeadersLike, MultipleValuesError
 from ..exceptions import (
     AbortHandshake,
@@ -42,7 +43,6 @@
 from ..http import USER_AGENT
 from ..protocol import State
 from ..typing import ExtensionHeader, LoggerLike, Origin, StatusLike, Subprotocol
-from .compatibility import asyncio_timeout
 from .handshake import build_response, check_request
 from .http import read_request
 from .protocol import WebSocketCommonProtocol

src/websockets/legacy/client.py

@@ -14,6 +14,7 @@
 import urllib.request
 import warnings
 
+from websockets.asyncio.compatibility import asyncio_timeout
 from websockets.datastructures import Headers
 from websockets.exceptions import (
     ConnectionClosed,
@@ -30,7 +31,6 @@
 from websockets.frames import CloseCode
 from websockets.http import USER_AGENT
 from websockets.legacy.client import *
-from websockets.legacy.compatibility import asyncio_timeout
 from websockets.legacy.handshake import build_response
 from websockets.legacy.http import read_response
 from websockets.legacy.server import *

src/websockets/legacy/protocol.py

@@ -52,8 +52,9 @@ def get_mapping(src_dir="src"):
         os.path.relpath(src_file, src_dir)
         for src_file in sorted(src_files)
         if "legacy" not in os.path.dirname(src_file)
-        if os.path.basename(src_file) != "__init__.py"
+        and os.path.basename(src_file) != "__init__.py"
         and os.path.basename(src_file) != "__main__.py"
+        and os.path.basename(src_file) != "async_timeout.py"
         and os.path.basename(src_file) != "compatibility.py"
     ]
     test_files = [
@@ -102,7 +103,8 @@ def get_ignored_files(src_dir="src"):
         "*/websockets/typing.py",
         # We don't test compatibility modules with previous versions of Python
         # or websockets (import locations).
-        "*/websockets/*/compatibility.py",
+        "*/websockets/asyncio/async_timeout.py",
+        "*/websockets/asyncio/compatibility.py",
         "*/websockets/auth.py",
         # This approach isn't applicable to the test suite of the legacy
         # implementation, due to the huge test_client_server test module.