Merge branch 'get_or_fetch' of https://github.com/Lumabots/pycord into get_or_fetch

Author: Lumabots

discord/client.py

@@ -69,7 +69,7 @@
 from .threads import Thread
 from .ui.view import View
 from .user import ClientUser, User
-from .utils import _FETCHABLE, MISSING, _D
+from .utils import _D, _FETCHABLE, MISSING
 from .voice_client import VoiceClient
 from .webhook import Webhook
 from .widget import Widget
@@ -248,9 +248,9 @@ def __init__(
         self.loop: asyncio.AbstractEventLoop = (
             asyncio.get_event_loop() if loop is None else loop
         )
-        self._listeners: dict[
-            str, list[tuple[asyncio.Future, Callable[..., bool]]]
-        ] = {}
+        self._listeners: dict[str, list[tuple[asyncio.Future, Callable[..., bool]]]] = (
+            {}
+        )
         self.shard_id: int | None = options.get("shard_id")
         self.shard_count: int | None = options.get("shard_count")
 
@@ -1205,13 +1205,13 @@ async def get_or_fetch(
 
     @overload
     async def get_or_fetch(
-        self: "Client",
+        self: Client,
         object_type: type[_FETCHABLE],
         object_id: int,
     ) -> _FETCHABLE: ...
 
     async def get_or_fetch(
-        self: "Client",
+        self: Client,
         object_type: type[_FETCHABLE],
         object_id: int | None,
         default: _D = MISSING,

discord/guild.py

@@ -85,7 +85,7 @@
 from .sticker import GuildSticker
 from .threads import Thread, ThreadMember
 from .user import User
-from .utils import _FETCHABLE, _D
+from .utils import _D, _FETCHABLE
 from .welcome_screen import WelcomeScreen, WelcomeScreenChannel
 from .widget import Widget