From 0c1670978e451acdee457e9bde8ca5777670f9cc Mon Sep 17 00:00:00 2001 From: Lumouille <144063653+Lumabots@users.noreply.github.com> Date: Thu, 22 May 2025 22:52:47 +0300 Subject: [PATCH 1/4] refractor: remove unused import + double import Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com> --- discord/http.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/discord/http.py b/discord/http.py index 2db704b268..2edf846239 100644 --- a/discord/http.py +++ b/discord/http.py @@ -34,7 +34,7 @@ import aiohttp -from . import __version__, utils +from . import __version__ from .errors import ( DiscordServerError, Forbidden, @@ -46,7 +46,7 @@ ) from .file import VoiceMessage from .gateway import DiscordClientWebSocketResponse -from .utils import MISSING, warn_deprecated +import .utils _log = logging.getLogger(__name__) @@ -179,7 +179,7 @@ def __init__( asyncio.get_event_loop() if loop is None else loop ) self.connector = connector - self.__session: aiohttp.ClientSession = MISSING # filled in static_login + self.__session: aiohttp.ClientSession = utils.MISSING # filled in static_login self._locks: weakref.WeakValueDictionary = weakref.WeakValueDictionary() self._global_over: asyncio.Event = asyncio.Event() self._global_over.set() From 829749c7d8e42dbfcdc5dc83b7148f2233e19d22 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 19:57:31 +0000 Subject: [PATCH 2/4] style(pre-commit): auto fixes from pre-commit.com hooks --- discord/http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discord/http.py b/discord/http.py index 2edf846239..ddab1cb28b 100644 --- a/discord/http.py +++ b/discord/http.py @@ -34,6 +34,7 @@ import aiohttp +import .utils from . import __version__ from .errors import ( DiscordServerError, @@ -46,7 +47,6 @@ ) from .file import VoiceMessage from .gateway import DiscordClientWebSocketResponse -import .utils _log = logging.getLogger(__name__) From 78ae9abe7055fb6013baa39d2021374fcaaf5131 Mon Sep 17 00:00:00 2001 From: Lumouille <144063653+Lumabots@users.noreply.github.com> Date: Thu, 22 May 2025 23:02:51 +0300 Subject: [PATCH 3/4] fix: correct import statement for utils module --- discord/http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discord/http.py b/discord/http.py index ddab1cb28b..7d0c791024 100644 --- a/discord/http.py +++ b/discord/http.py @@ -33,8 +33,8 @@ from urllib.parse import quote as _uriquote import aiohttp +import utils -import .utils from . import __version__ from .errors import ( DiscordServerError, From 11d5e72718f5646e0e195f29354592e881513b1b Mon Sep 17 00:00:00 2001 From: Lumouille <144063653+Lumabots@users.noreply.github.com> Date: Thu, 22 May 2025 23:38:40 +0300 Subject: [PATCH 4/4] fix: correct import statement for utils module --- discord/http.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/discord/http.py b/discord/http.py index 7d0c791024..6ff724b76a 100644 --- a/discord/http.py +++ b/discord/http.py @@ -33,7 +33,6 @@ from urllib.parse import quote as _uriquote import aiohttp -import utils from . import __version__ from .errors import ( @@ -47,6 +46,13 @@ ) from .file import VoiceMessage from .gateway import DiscordClientWebSocketResponse +from .utils import ( + MISSING, + _from_json, + _get_mime_type_for_image, + _parse_ratelimit_header, + _to_json, +) _log = logging.getLogger(__name__) @@ -97,7 +103,7 @@ async def json_or_text(response: aiohttp.ClientResponse) -> dict[str, Any] | str text = await response.text(encoding="utf-8") try: if response.headers["content-type"] == "application/json": - return utils._from_json(text) + return _from_json(text) except KeyError: # Thanks Cloudflare pass @@ -179,7 +185,7 @@ def __init__( asyncio.get_event_loop() if loop is None else loop ) self.connector = connector - self.__session: aiohttp.ClientSession = utils.MISSING # filled in static_login + self.__session: aiohttp.ClientSession = MISSING # filled in static_login self._locks: weakref.WeakValueDictionary = weakref.WeakValueDictionary() self._global_over: asyncio.Event = asyncio.Event() self._global_over.set() @@ -246,7 +252,7 @@ async def request( # some checking if it's a JSON request if "json" in kwargs: headers["Content-Type"] = "application/json" - kwargs["data"] = utils._to_json(kwargs.pop("json")) + kwargs["data"] = _to_json(kwargs.pop("json")) try: reason = kwargs.pop("reason") @@ -304,7 +310,7 @@ async def request( remaining = response.headers.get("X-Ratelimit-Remaining") if remaining == "0" and response.status != 429: # we've depleted our current bucket - delta = utils._parse_ratelimit_header( + delta = _parse_ratelimit_header( response, use_clock=self.use_clock ) _log.debug( @@ -590,7 +596,7 @@ def send_multipart_helper( } ) payload["attachments"] = attachments - form[0]["value"] = utils._to_json(payload) + form[0]["value"] = _to_json(payload) return self.request(route, form=form, files=files) def send_files( @@ -663,7 +669,7 @@ def edit_multipart_helper( payload["attachments"] = attachments else: payload["attachments"].extend(attachments) - form[0]["value"] = utils._to_json(payload) + form[0]["value"] = _to_json(payload) return self.request(route, form=form, files=files) @@ -1295,7 +1301,7 @@ def start_forum_thread( ) payload["attachments"] = attachments - form[0]["value"] = utils._to_json(payload) + form[0]["value"] = _to_json(payload) return self.request(route, form=form, reason=reason) return self.request(route, json=payload, reason=reason) @@ -1762,7 +1768,7 @@ def create_guild_sticker( initial_bytes = file.fp.read(16) try: - mime_type = utils._get_mime_type_for_image(initial_bytes) + mime_type = _get_mime_type_for_image(initial_bytes) except InvalidArgument: if initial_bytes.startswith(b"{"): mime_type = "application/json" @@ -2764,7 +2770,7 @@ def _edit_webhook_helper( form: list[dict[str, Any]] = [ { "name": "payload_json", - "value": utils._to_json(payload), + "value": _to_json(payload), } ]