Minor tweaks to recent commits

Author: pgjones

src/hypercorn/protocol/h3.py

@@ -86,7 +86,6 @@ async def stream_send(self, event: StreamEvent) -> None:
             self.connection.send_headers(event.stream_id, event.headers)
             await self.send()
         elif isinstance(event, StreamClosed):
-            # Remove a stream when it's closed to avoid memory leaks
             self.streams.pop(event.stream_id, None)
         elif isinstance(event, Request):
             await self._create_server_push(event.stream_id, event.raw_path, event.headers)

src/hypercorn/protocol/http_stream.py

@@ -97,7 +97,7 @@ async def handle(self, event: Event) -> None:
                 "headers": event.headers,
                 "client": self.client,
                 "server": self.server,
-                "state": event.state.copy(),
+                "state": event.state.copy(),  # type: ignore[typeddict-item]
                 "extensions": {},
             }
 

src/hypercorn/protocol/ws_stream.py

@@ -219,7 +219,7 @@ async def handle(self, event: Event) -> None:
                 "headers": event.headers,
                 "client": self.client,
                 "server": self.server,
-                "state": event.state.copy(),
+                "state": event.state.copy(),  # type: ignore[typeddict-item]
                 "subprotocols": self.handshake.subprotocols or [],
                 "extensions": {"websocket.http.response": {}},
             }

tests/e2e/test_httpx.py

@@ -6,6 +6,7 @@
 
 import hypercorn.trio
 from hypercorn.config import Config
+from hypercorn.typing import ASGIReceiveCallable, ASGISendCallable, Scope
 
 
 async def app(scope, receive, send) -> None:  # type: ignore
@@ -58,24 +59,28 @@ async def serve() -> None:
 
 
 @pytest.mark.trio
-async def test_handle_isolate_state():
+async def test_handle_isolate_state() -> None:
     config = Config()
     config.bind = ["0.0.0.0:1234"]
     config.accesslog = "-"  # Log to stdout/err
     config.errorlog = "-"
 
-    async def app(scope, receive, send):
+    async def app(scope: Scope, receive: ASGIReceiveCallable, send: ASGISendCallable) -> None:
         assert scope["type"] == "http"
 
         await send(
             {
                 "type": "http.response.start",
                 "status": 200,
-                "headers": [[b"content-type", b"text/plain"]],
+                "headers": [(b"content-type", b"text/plain")],
             }
         )
         await send(
-            {"type": "http.response.body", "body": scope["state"].get("key", b"")}
+            {
+                "type": "http.response.body",
+                "body": scope["state"].get("key", b""),
+                "more_body": False,
+            }
         )
         scope["state"]["key"] = b"one"