From: Thomas Grainger Date: Sat, 4 Jan 2025 07:25:47 +0000 (+0000) Subject: Merge branch 'master' into avoid-collapsing-user-exception-groups X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Favoid-collapsing-user-exception-groups;p=thirdparty%2Fstarlette.git Merge branch 'master' into avoid-collapsing-user-exception-groups --- f30ef9fa171a7d972bae3881c128cb27094488d2 diff --cc starlette/middleware/base.py index 77404f79,f146984b..56bbc9d1 --- a/starlette/middleware/base.py +++ b/starlette/middleware/base.py @@@ -172,9 -172,10 +172,10 @@@ class BaseHTTPMiddleware response.raw_headers = message["headers"] return response - send_stream, recv_stream = anyio.create_memory_object_stream[Message]() + streams: anyio.create_memory_object_stream[Message] = anyio.create_memory_object_stream() + send_stream, recv_stream = streams - with recv_stream, send_stream, collapse_excgroups(): - async with anyio.create_task_group() as task_group: + with recv_stream, send_stream: + async with create_collapsing_task_group() as task_group: response = await self.dispatch_func(request, call_next) await response(scope, wrapped_receive, send) response_sent.set()