Skip to content
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

Fix deprecated calls to guess_type for paths with Python 3.13 #10102

Merged
merged 6 commits into from
Dec 4, 2024
Merged

Fix deprecated calls to guess_type for paths with Python 3.13 #10102

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b19b21f
Fix incorrect call to guess_type in FileResponse
bdraco Dec 4, 2024
263fb9a
only deprecated on 3.13
bdraco Dec 4, 2024
8851a0b
fix
bdraco Dec 4, 2024
851fcbc
one more place
bdraco Dec 4, 2024
3587be4
changelog
bdraco Dec 4, 2024
381da37
Update CHANGES/10102.bugfix.rst
bdraco Dec 4, 2024
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
1 change: 1 addition & 0 deletions CHANGES/10102.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Replaced deprecated call to :func:`mime_types.guess_type` with :func:`mime_types.guess_file_type` when using Python 3.13+ -- by :user:`bdraco`.
bdraco marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 6 additions & 1 deletion aiohttp/payload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import json
import mimetypes
import os
import sys
import warnings
from abc import ABC, abstractmethod
from itertools import chain
Expand Down Expand Up @@ -169,7 +170,11 @@ def __init__(
assert isinstance(content_type, str)
self._headers[hdrs.CONTENT_TYPE] = content_type
elif self._filename is not None:
content_type = mimetypes.guess_type(self._filename)[0]
if sys.version_info >= (3, 13):
guesser = mimetypes.guess_file_type
else:
guesser = mimetypes.guess_type
content_type = guesser(self._filename)[0]
if content_type is None:
content_type = self._default_content_type
self._headers[hdrs.CONTENT_TYPE] = content_type
Expand Down
9 changes: 6 additions & 3 deletions aiohttp/web_fileresponse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import asyncio
import os
import pathlib
import sys
from contextlib import suppress
from mimetypes import MimeTypes
from stat import S_ISREG
Expand Down Expand Up @@ -314,9 +315,11 @@ async def prepare(self, request: "BaseRequest") -> Optional[AbstractStreamWriter
# extension of the request path. The encoding returned by guess_type
# can be ignored since the map was cleared above.
if hdrs.CONTENT_TYPE not in self.headers:
self.content_type = (
CONTENT_TYPES.guess_type(self._path)[0] or FALLBACK_CONTENT_TYPE
)
if sys.version_info >= (3, 13):
guesser = CONTENT_TYPES.guess_file_type
else:
guesser = CONTENT_TYPES.guess_type
self.content_type = guesser(self._path)[0] or FALLBACK_CONTENT_TYPE

if file_encoding:
self.headers[hdrs.CONTENT_ENCODING] = file_encoding
Expand Down
Loading