Fix typing issues

These are now preset as h11 is typed.

Author: pgjones

src/wsproto/handshake.py

@@ -119,7 +119,7 @@ def receive_data(self, data: Optional[bytes]) -> None:
 
         :param bytes data: Data received from the WebSocket peer.
         """
-        self._h11_connection.receive_data(data)
+        self._h11_connection.receive_data(data or b"")
         while True:
             try:
                 event = self._h11_connection.next_event()
@@ -141,7 +141,7 @@ def receive_data(self, data: Optional[bytes]) -> None:
                     else:
                         self._events.append(
                             RejectConnection(
-                                headers=event.headers,
+                                headers=list(event.headers),
                                 status_code=event.status_code,
                                 has_body=False,
                             )
@@ -151,7 +151,7 @@ def receive_data(self, data: Optional[bytes]) -> None:
                     self._state = ConnectionState.REJECTING
                     self._events.append(
                         RejectConnection(
-                            headers=event.headers,
+                            headers=list(event.headers),
                             status_code=event.status_code,
                             has_body=True,
                         )
@@ -286,36 +286,36 @@ def _accept(self, event: AcceptConnection) -> bytes:
             event.extensions,
         )
         self._state = ConnectionState.OPEN
-        return self._h11_connection.send(response)  # type: ignore[no-any-return]
+        return self._h11_connection.send(response) or b""
 
     def _reject(self, event: RejectConnection) -> bytes:
         if self.state != ConnectionState.CONNECTING:
             raise LocalProtocolError(
                 "Connection cannot be rejected in state %s" % self.state
             )
 
-        headers = event.headers
+        headers = list(event.headers)
         if not event.has_body:
             headers.append((b"content-length", b"0"))
         response = h11.Response(status_code=event.status_code, headers=headers)
-        data = self._h11_connection.send(response)
+        data = self._h11_connection.send(response) or b""
         self._state = ConnectionState.REJECTING
         if not event.has_body:
-            data += self._h11_connection.send(h11.EndOfMessage())
+            data += self._h11_connection.send(h11.EndOfMessage()) or b""
             self._state = ConnectionState.CLOSED
-        return data  # type: ignore[no-any-return]
+        return data
 
     def _send_reject_data(self, event: RejectData) -> bytes:
         if self.state != ConnectionState.REJECTING:
             raise LocalProtocolError(
                 f"Cannot send rejection data in state {self.state}"
             )
 
-        data = self._h11_connection.send(h11.Data(data=event.data))
+        data = self._h11_connection.send(h11.Data(data=event.data)) or b""
         if event.body_finished:
-            data += self._h11_connection.send(h11.EndOfMessage())
+            data += self._h11_connection.send(h11.EndOfMessage()) or b""
             self._state = ConnectionState.CLOSED
-        return data  # type: ignore[no-any-return]
+        return data
 
     # Client mode methods
 
@@ -360,7 +360,7 @@ def _initiate_connection(self, request: Request) -> bytes:
             target=request.target.encode("ascii"),
             headers=headers + request.extra_headers,
         )
-        return self._h11_connection.send(upgrade)  # type: ignore[no-any-return]
+        return self._h11_connection.send(upgrade) or b""
 
     def _establish_client_connection(
         self, event: h11.InformationalResponse
@@ -387,7 +387,7 @@ def _establish_client_connection(
                 accept = value
                 continue  # Skip appending to headers
             elif name == b"sec-websocket-protocol":
-                subprotocol = value
+                subprotocol = value.decode("ascii")
                 continue  # Skip appending to headers
             elif name == b"upgrade":
                 upgrade = value
@@ -408,7 +408,6 @@ def _establish_client_connection(
         if accept != accept_token:
             raise RemoteProtocolError("Bad accept token", event_hint=RejectConnection())
         if subprotocol is not None:
-            subprotocol = subprotocol.decode("ascii")
             if subprotocol not in self._initiating_request.subprotocols:
                 raise RemoteProtocolError(
                     f"unrecognized subprotocol {subprotocol}",

src/wsproto/utilities.py

@@ -7,7 +7,9 @@
 import base64
 import hashlib
 import os
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Union
+
+from h11._headers import Headers as H11Headers
 
 from .events import Event
 from .typing import Headers
@@ -51,7 +53,7 @@ def __init__(self, message: str, event_hint: Optional[Event] = None) -> None:
 
 
 # Some convenience utilities for working with HTTP headers
-def normed_header_dict(h11_headers: Headers) -> Dict[bytes, bytes]:
+def normed_header_dict(h11_headers: Union[Headers, H11Headers]) -> Dict[bytes, bytes]:
     # This mangles Set-Cookie headers. But it happens that we don't care about
     # any of those, so it's OK. For every other HTTP header, if there are
     # multiple instances then you're allowed to join them together with

test/test_client.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import cast, List, Optional
 
 import h11
 import pytest
@@ -27,7 +27,7 @@ def _make_connection_request(request: Request) -> h11.Request:
     client = WSConnection(CLIENT)
     server = h11.Connection(h11.SERVER)
     server.receive_data(client.send(request))
-    return server.next_event()
+    return cast(h11.Request, server.next_event())
 
 
 def test_connection_request() -> None:
@@ -114,7 +114,7 @@ def test_connection_send_state() -> None:
             )
         )
     )
-    headers = normed_header_dict(server.next_event().headers)
+    headers = normed_header_dict(cast(h11.Request, server.next_event()).headers)
     response = h11.InformationalResponse(
         status_code=101,
         headers=[
@@ -158,7 +158,7 @@ def _make_handshake(
             )
         )
     )
-    request = server.next_event()
+    request = cast(h11.Request, server.next_event())
     if auto_accept_key:
         full_request_headers = normed_header_dict(request.headers)
         response_headers.append(

test/test_server.py

@@ -5,13 +5,7 @@
 
 from wsproto import WSConnection
 from wsproto.connection import SERVER
-from wsproto.events import (
-    AcceptConnection,
-    Event,
-    RejectConnection,
-    RejectData,
-    Request,
-)
+from wsproto.events import AcceptConnection, RejectConnection, RejectData, Request
 from wsproto.extensions import Extension
 from wsproto.typing import Headers
 from wsproto.utilities import (
@@ -199,7 +193,7 @@ def _make_handshake(
         )
     )
     event = client.next_event()
-    return event, nonce
+    return cast(h11.InformationalResponse, event), nonce
 
 
 def test_handshake() -> None:
@@ -292,7 +286,7 @@ def test_protocol_error() -> None:
 
 def _make_handshake_rejection(
     status_code: int, body: Optional[bytes] = None
-) -> List[Event]:
+) -> List[h11.Event]:
     client = h11.Connection(h11.CLIENT)
     server = WSConnection(SERVER)
     nonce = generate_nonce()
@@ -327,7 +321,7 @@ def _make_handshake_rejection(
     events = []
     while True:
         event = client.next_event()
-        events.append(event)
+        events.append(cast(h11.Event, event))
         if isinstance(event, h11.EndOfMessage):
             return events