chore: Run pyupgrade --py310-plus on codebase

Author: Paillat-dev

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,
     TypeVar,
     Union,
     overload,

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

@@ -33,13 +33,11 @@
 import sys
 import types
 from collections import OrderedDict
+from collections.abc import Callable, Coroutine, Generator
 from enum import Enum
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Coroutine,
-    Generator,
     Generic,
     TypeVar,
     Union,
@@ -72,7 +70,7 @@
 if sys.version_info >= (3, 11):
     from typing import Annotated, Literal, get_args, get_origin
 else:
-    from typing_extensions import Annotated, Literal, get_args, get_origin
+    from typing import Annotated, Literal, get_args, get_origin
 
 __all__ = (
     "_BaseCommand",
@@ -90,7 +88,9 @@
 )
 
 if TYPE_CHECKING:
-    from typing_extensions import Concatenate, ParamSpec
+    from typing import Concatenate
+
+    from typing_extensions import ParamSpec
 
     from .. import Permissions
     from ..cog import Cog