Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Release History
1.4.0 (unreleased)
------------------

- Accept any sequence of ``(name, value)`` header pairs, matching ``h11``.

- Require ``event_hint`` when constructing ``RemoteProtocolError``.
This is an API-breaking change.

Expand Down
12 changes: 7 additions & 5 deletions src/wsproto/handshake.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ def initiate_upgrade_connection(
raise LocalProtocolError(
msg,
)
upgrade_request = h11.Request(method=b"GET", target=path, headers=headers)
upgrade_request = h11.Request(
method=b"GET", target=path, headers=list(headers),
)
h11_client = h11.Connection(h11.CLIENT)
self.receive_data(h11_client.send(upgrade_request))

Expand Down Expand Up @@ -204,7 +206,7 @@ def _process_connection_request(
subprotocols: list[str] = []
upgrade = b""
version = None
headers: Headers = []
headers: list[tuple[bytes, bytes]] = []
for name, value in event.headers:
name = name.lower()
if name == b"connection":
Expand Down Expand Up @@ -299,7 +301,7 @@ def _accept(self, event: AcceptConnection) -> bytes:

response = h11.InformationalResponse(
status_code=101,
headers=headers + event.extra_headers,
headers=headers + list(event.extra_headers),
reason=b"Switching Protocols",
)
self._connection = Connection(
Expand Down Expand Up @@ -381,7 +383,7 @@ def _initiate_connection(self, request: Request) -> bytes:
upgrade = h11.Request(
method=b"GET",
target=request.target.encode("ascii"),
headers=headers + request.extra_headers,
headers=headers + list(request.extra_headers),
)
return self._h11_connection.send(upgrade) or b""

Expand All @@ -397,7 +399,7 @@ def _establish_client_connection(
accepts: list[str] = []
subprotocol = None
upgrade = b""
headers: Headers = []
headers: list[tuple[bytes, bytes]] = []
for name, value in event.headers:
name = name.lower()
if name == b"connection":
Expand Down
4 changes: 2 additions & 2 deletions src/wsproto/typing.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from __future__ import annotations
from collections.abc import Sequence

Headers = list[tuple[bytes, bytes]]
Headers = Sequence[tuple[bytes, bytes]]
Loading