Move InvalidStatusCode to the legacy package.

It is only used by the legacy implementation.

Author: aaugustin

src/websockets/__init__.py

@@ -28,7 +28,6 @@
     "InvalidParameterValue",
     "InvalidState",
     "InvalidStatus",
-    "InvalidStatusCode",
     "InvalidUpgrade",
     "InvalidURI",
     "NegotiationError",
@@ -47,6 +46,7 @@
     "unix_connect",
     # .legacy.exceptions
     "InvalidMessage",
+    "InvalidStatusCode",
     # .legacy.protocol
     "WebSocketCommonProtocol",
     # .legacy.server
@@ -86,7 +86,6 @@
         InvalidParameterValue,
         InvalidState,
         InvalidStatus,
-        InvalidStatusCode,
         InvalidUpgrade,
         InvalidURI,
         NegotiationError,
@@ -102,7 +101,7 @@
         basic_auth_protocol_factory,
     )
     from .legacy.client import WebSocketClientProtocol, connect, unix_connect
-    from .legacy.exceptions import InvalidMessage
+    from .legacy.exceptions import InvalidMessage, InvalidStatusCode
     from .legacy.protocol import WebSocketCommonProtocol
     from .legacy.server import (
         WebSocketServer,
@@ -146,7 +145,6 @@
             "InvalidParameterValue": ".exceptions",
             "InvalidState": ".exceptions",
             "InvalidStatus": ".exceptions",
-            "InvalidStatusCode": ".exceptions",
             "InvalidUpgrade": ".exceptions",
             "InvalidURI": ".exceptions",
             "NegotiationError": ".exceptions",
@@ -165,6 +163,7 @@
             "unix_connect": ".legacy.client",
             # .legacy.exceptions
             "InvalidMessage": ".legacy.exceptions",
+            "InvalidStatusCode": ".legacy.exceptions",
             # .legacy.protocol
             "WebSocketCommonProtocol": ".legacy.protocol",
             # .legacy.server

src/websockets/exceptions.py

@@ -250,20 +250,6 @@ def __str__(self) -> str:
         )
 
 
-class InvalidStatusCode(InvalidHandshake):
-    """
-    Raised when a handshake response status code is invalid.
-
-    """
-
-    def __init__(self, status_code: int, headers: datastructures.Headers) -> None:
-        self.status_code = status_code
-        self.headers = headers
-
-    def __str__(self) -> str:
-        return f"server rejected WebSocket connection: HTTP {self.status_code}"
-
-
 class NegotiationError(InvalidHandshake):
     """
     Raised when negotiating an extension fails.
@@ -406,14 +392,18 @@ class ProtocolError(WebSocketException):
 
 # When type checking, import non-deprecated aliases eagerly. Else, import on demand.
 if typing.TYPE_CHECKING:
-    from .legacy.exceptions import InvalidMessage
+    from .legacy.exceptions import (
+        InvalidMessage,
+        InvalidStatusCode,
+    )
 
     WebSocketProtocolError = ProtocolError
 else:
     lazy_import(
         globals(),
         aliases={
             "InvalidMessage": ".legacy.exceptions",
+            "InvalidStatusCode": ".legacy.exceptions",
             "WebSocketProtocolError": ".legacy.exceptions",
         },
     )

src/websockets/legacy/client.py

@@ -21,7 +21,6 @@
 from ..exceptions import (
     InvalidHandshake,
     InvalidHeader,
-    InvalidStatusCode,
     NegotiationError,
     RedirectHandshake,
     SecurityError,
@@ -40,7 +39,7 @@
 from ..http11 import USER_AGENT
 from ..typing import ExtensionHeader, LoggerLike, Origin, Subprotocol
 from ..uri import WebSocketURI, parse_uri
-from .exceptions import InvalidMessage
+from .exceptions import InvalidMessage, InvalidStatusCode
 from .handshake import build_request, check_response
 from .http import read_response
 from .protocol import WebSocketCommonProtocol

src/websockets/legacy/exceptions.py

@@ -1,3 +1,4 @@
+from .. import datastructures
 from ..exceptions import (
     InvalidHandshake,
     ProtocolError as WebSocketProtocolError,  # noqa: F401
@@ -9,3 +10,17 @@ class InvalidMessage(InvalidHandshake):
     Raised when a handshake request or response is malformed.
 
     """
+
+
+class InvalidStatusCode(InvalidHandshake):
+    """
+    Raised when a handshake response status code is invalid.
+
+    """
+
+    def __init__(self, status_code: int, headers: datastructures.Headers) -> None:
+        self.status_code = status_code
+        self.headers = headers
+
+    def __str__(self) -> str:
+        return f"server rejected WebSocket connection: HTTP {self.status_code}"

tests/legacy/test_exceptions.py

@@ -1,5 +1,6 @@
 import unittest
 
+from websockets.datastructures import Headers
 from websockets.legacy.exceptions import *
 
 
@@ -10,6 +11,10 @@ def test_str(self):
                 InvalidMessage("malformed HTTP message"),
                 "malformed HTTP message",
             ),
+            (
+                InvalidStatusCode(403, Headers()),
+                "server rejected WebSocket connection: HTTP 403",
+            ),
         ]:
             with self.subTest(exception=exception):
                 self.assertEqual(str(exception), exception_str)

tests/test_exceptions.py

@@ -127,10 +127,6 @@ def test_str(self):
                 InvalidStatus(Response(401, "Unauthorized", Headers())),
                 "server rejected WebSocket connection: HTTP 401",
             ),
-            (
-                InvalidStatusCode(403, Headers()),
-                "server rejected WebSocket connection: HTTP 403",
-            ),
             (
                 NegotiationError("unsupported subprotocol: spam"),
                 "unsupported subprotocol: spam",