Skip to content

Fixed #34428 -- Made ASGIStaticFilesHandler adapt response to async i… #16670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2023
Merged

Fixed #34428 -- Made ASGIStaticFilesHandler adapt response to async i… #16670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions django/contrib/staticfiles/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,13 @@ async def __call__(self, scope, receive, send):
async def get_response_async(self, request):
response = await super().get_response_async(request)
response._resource_closers.append(request.close)
# FileResponse is not async compatible.
if response.streaming and not response.is_async:
_iterator = response.streaming_content

async def awrapper():
for part in await sync_to_async(list)(_iterator):
yield part

response.streaming_content = awrapper()
return response
1 change: 0 additions & 1 deletion tests/asgi/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ async def test_file_response(self):
"django.contrib.staticfiles.finders.FileSystemFinder",
],
)
@ignore_warnings(module="django.http.response")
async def test_static_file_response(self):
application = ASGIStaticFilesHandler(get_asgi_application())
# Construct HTTP request.
Expand Down