chore: Codebase cleanup after going python 3.10+

discord/__main__.py

@@ -28,7 +28,6 @@
 import platform
 import sys
 from pathlib import Path
-from typing import Tuple
 
 import aiohttp
 
@@ -352,7 +351,7 @@ def add_newcog_args(subparser: argparse._SubParsersAction) -> None:
     )
 
 
-def parse_args() -> Tuple[argparse.ArgumentParser, argparse.Namespace]:
+def parse_args() -> tuple[argparse.ArgumentParser, argparse.Namespace]:
     parser = argparse.ArgumentParser(
         prog="discord", description="Tools for helping with Pycord"
     )

discord/abc.py

@@ -28,13 +28,11 @@
 import asyncio
 import copy
 import time
+from collections.abc import Callable, Iterable, Sequence
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Iterable,
     Protocol,
-    Sequence,
     TypeAlias,
     TypeVar,
     Union,

discord/audit_logs.py

@@ -26,8 +26,9 @@
 from __future__ import annotations
 
 import datetime
+from collections.abc import Callable, Generator
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Generator, TypeVar
+from typing import TYPE_CHECKING, Any, ClassVar, TypeVar
 
 from . import enums, utils
 from .asset import Asset

discord/backoff.py

@@ -27,7 +27,8 @@
 
 import random
 import time
-from typing import Callable, Generic, Literal, TypeVar, overload
+from collections.abc import Callable
+from typing import Generic, Literal, TypeVar, overload
 
 T = TypeVar("T", bool, Literal[True], Literal[False])
 

discord/bot.py

@@ -34,14 +34,11 @@
 import sys
 import traceback
 from abc import ABC, abstractmethod
+from collections.abc import Callable, Coroutine, Generator, Mapping
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Coroutine,
-    Generator,
     Literal,
-    Mapping,
     TypeVar,
 )
 

discord/channel.py

@@ -26,14 +26,11 @@
 from __future__ import annotations
 
 import datetime
+from collections.abc import Callable, Iterable, Mapping, Sequence
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Iterable,
-    Mapping,
     NamedTuple,
-    Sequence,
     TypeVar,
     overload,
 )

discord/client.py

@@ -30,14 +30,11 @@
 import signal
 import sys
 import traceback
+from collections.abc import Callable, Coroutine, Generator, Sequence
 from types import TracebackType
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Coroutine,
-    Generator,
-    Sequence,
     TypeVar,
 )
 

discord/cog.py

@@ -31,18 +31,16 @@
 import pathlib
 import sys
 import types
-from collections.abc import Generator, Mapping
+from collections.abc import Callable, Generator, Mapping
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     ClassVar,
+    TypeGuard,
     TypeVar,
     overload,
 )
 
-from typing_extensions import TypeGuard
-
 import discord.utils
 
 from . import errors

discord/commands/context.py

@@ -32,7 +32,7 @@
 from discord.webhook.async_ import Webhook
 
 if TYPE_CHECKING:
-    from typing import Awaitable, Callable
+    from collections.abc import Awaitable, Callable
 
     from typing_extensions import ParamSpec
 

discord/commands/core.py

@@ -30,21 +30,24 @@
 import functools
 import inspect
 import re
-import sys
 import types
 from collections import OrderedDict
+from collections.abc import Callable, Coroutine, Generator
 from enum import Enum
 from typing import (
     TYPE_CHECKING,
+    Annotated,
     Any,
-    Callable,
-    Coroutine,
-    Generator,
     Generic,
+    Literal,
     TypeVar,
     Union,
+    get_args,
+    get_origin,
 )
 
+from typing_extensions import Self
+
 from ..channel import PartialMessageable, _threaded_guild_channel_factory
 from ..enums import Enum as DiscordEnum
 from ..enums import (
@@ -69,11 +72,6 @@
 from .context import ApplicationContext, AutocompleteContext
 from .options import Option, OptionChoice
 
-if sys.version_info >= (3, 11):
-    from typing import Annotated, Literal, Self, get_args, get_origin
-else:
-    from typing_extensions import Annotated, Literal, Self, get_args, get_origin
-
 __all__ = (
     "_BaseCommand",
     "ApplicationCommand",
@@ -90,7 +88,9 @@
 )
 
 if TYPE_CHECKING:
-    from typing_extensions import Concatenate, Never, ParamSpec
+    from typing import Concatenate
+
+    from typing_extensions import Never, ParamSpec
 
     from .. import Permissions
     from ..bot import C

discord/commands/options.py

@@ -35,7 +35,6 @@
     Any,
     Literal,
     Optional,
-    Type,
     TypeVar,
     Union,
     get_args,
@@ -72,22 +71,22 @@
     from ..user import User
 
     InputType = Union[
-        Type[str],
-        Type[bool],
-        Type[int],
-        Type[float],
-        Type[GuildChannel],
-        Type[Thread],
-        Type[Member],
-        Type[User],
-        Type[Attachment],
-        Type[Role],
-        Type[Mentionable],
+        type[str],
+        type[bool],
+        type[int],
+        type[float],
+        type[GuildChannel],
+        type[Thread],
+        type[Member],
+        type[User],
+        type[Attachment],
+        type[Role],
+        type[Mentionable],
         SlashCommandOptionType,
         Converter,
-        Type[Converter],
-        Type[Enum],
-        Type[DiscordEnum],
+        type[Converter],
+        type[Enum],
+        type[DiscordEnum],
     ]
 
     AutocompleteReturnType = Union[

discord/commands/permissions.py

@@ -23,7 +23,7 @@
 DEALINGS IN THE SOFTWARE.
 """
 
-from typing import Callable
+from collections.abc import Callable
 
 from ..enums import InteractionContextType
 from ..permissions import Permissions

discord/components.py

@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, ClassVar, Iterator, TypeVar, overload
+from collections.abc import Iterator
+from typing import TYPE_CHECKING, Any, ClassVar, TypeVar, overload
 
 from .asset import AssetMixin
 from .colour import Colour

discord/embeds.py

@@ -26,7 +26,8 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Any, Mapping, TypeVar
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, Any, TypeVar
 
 from . import utils
 from .colour import Colour

discord/emoji.py

@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Iterator, Literal
+from collections.abc import Iterator
+from typing import TYPE_CHECKING, Any, Literal
 
 from .asset import Asset, AssetMixin
 from .partial_emoji import PartialEmoji, _EmojiTag

discord/ext/bridge/core.py

@@ -26,8 +26,8 @@
 from __future__ import annotations
 
 import inspect
-from collections.abc import Iterator
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable, Iterator
+from typing import TYPE_CHECKING, Any
 
 import discord.commands.options
 from discord import (

discord/ext/commands/_types.py

@@ -23,7 +23,8 @@
 DEALINGS IN THE SOFTWARE.
 """
 
-from typing import TYPE_CHECKING, Any, Callable, Coroutine, TypeVar, Union
+from collections.abc import Callable, Coroutine
+from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 if TYPE_CHECKING:
     from .cog import Cog

discord/ext/commands/bot.py

@@ -29,7 +29,8 @@
 import collections.abc
 import sys
 import traceback
-from typing import TYPE_CHECKING, Any, Callable, Coroutine, Iterable, TypeVar
+from collections.abc import Callable, Coroutine, Iterable
+from typing import TYPE_CHECKING, Any, TypeVar
 
 import discord
 

discord/ext/commands/cog.py

@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Generator, TypeVar
+from collections.abc import Callable, Generator
+from typing import TYPE_CHECKING, Any, TypeVar
 
 import discord
 

discord/ext/commands/converter.py

@@ -27,12 +27,11 @@
 
 import inspect
 import re
+from collections.abc import Iterable
 from typing import (
     TYPE_CHECKING,
     Any,
     Generic,
-    Iterable,
-    List,
     Literal,
     Protocol,
     TypeVar,
@@ -1023,7 +1022,7 @@ def repl(match: re.Match) -> str:
         return discord.utils.escape_mentions(result)
 
 
-class Greedy(List[T]):
+class Greedy(list[T]):
     r"""A special converter that greedily consumes arguments until it can't.
     As a consequence of this behaviour, most input errors are silently discarded,
     since it is used as an indicator of when to stop parsing.
@@ -1100,7 +1099,7 @@ def get_converter(param: inspect.Parameter) -> Any:
     return converter
 
 
-_GenericAlias = type(List[T])
+_GenericAlias = type(list[T])
 
 
 def is_generic_type(tp: Any, *, _GenericAlias: type = _GenericAlias) -> bool:

discord/ext/commands/cooldowns.py

@@ -28,7 +28,8 @@
 import asyncio
 import time
 from collections import deque
-from typing import TYPE_CHECKING, Any, Callable, Deque, TypeVar
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, Deque, TypeVar
 
 import discord.abc
 from discord.enums import Enum

discord/ext/commands/core.py

@@ -30,11 +30,10 @@
 import functools
 import inspect
 import types
+from collections.abc import Callable, Generator
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Generator,
     Generic,
     Literal,
     TypeVar,
@@ -67,7 +66,9 @@
 from .errors import *
 
 if TYPE_CHECKING:
-    from typing_extensions import Concatenate, ParamSpec, TypeGuard
+    from typing import Concatenate, TypeGuard
+
+    from typing_extensions import ParamSpec
 
     from discord.message import Message
 

discord/ext/commands/errors.py

@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 from discord.errors import ClientException, DiscordException
 

discord/ext/commands/flags.py

@@ -28,8 +28,10 @@
 import inspect
 import re
 import sys
+from collections.abc import Iterator
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any, Iterator, Literal, Pattern, TypeVar, Union
+from re import Pattern
+from typing import TYPE_CHECKING, Any, Literal, TypeVar, Union
 
 from discord.utils import (
     MISSING,