From 0fdca7eb7d59700f5c01dfadd38bddb1de02dadc Mon Sep 17 00:00:00 2001 From: Zomatree Date: Mon, 25 Apr 2022 13:40:39 +0100 Subject: [PATCH] isort --- revolt/client.py | 2 +- revolt/embed.py | 8 ++++---- revolt/ext/commands/__init__.py | 2 +- revolt/ext/commands/client.py | 10 ++++++---- revolt/ext/commands/cog.py | 2 +- revolt/ext/commands/command.py | 4 ++-- revolt/ext/commands/group.py | 2 +- revolt/ext/commands/help.py | 14 ++++++++------ revolt/ext/commands/utils.py | 2 +- revolt/http.py | 10 ++++++---- revolt/message.py | 4 ++-- revolt/role.py | 2 +- revolt/server.py | 3 ++- revolt/types/channel.py | 1 + revolt/types/embed.py | 1 + revolt/types/gateway.py | 11 +++++------ revolt/types/member.py | 1 + revolt/types/message.py | 1 + revolt/types/server.py | 1 + revolt/types/user.py | 1 + revolt/utils.py | 5 +++-- revolt/websocket.py | 11 ++++++----- 22 files changed, 56 insertions(+), 42 deletions(-) diff --git a/revolt/client.py b/revolt/client.py index a520e0a..50ff676 100755 --- a/revolt/client.py +++ b/revolt/client.py @@ -12,8 +12,8 @@ from .http import HttpClient from .invite import Invite from .message import Message from .state import State -from .websocket import WebsocketHandler from .utils import Missing +from .websocket import WebsocketHandler try: import ujson as json diff --git a/revolt/embed.py b/revolt/embed.py index b9a8344..f0f2840 100755 --- a/revolt/embed.py +++ b/revolt/embed.py @@ -2,17 +2,17 @@ from __future__ import annotations from typing import TYPE_CHECKING, Optional, Union -from .enums import EmbedType from .asset import Asset +from .enums import EmbedType if TYPE_CHECKING: from .state import State from .types import Embed as EmbedPayload - from .types import SendableEmbed as SendableEmbedPayload - from .types import WebsiteEmbed as WebsiteEmbedPayload from .types import ImageEmbed as ImageEmbedPayload - from .types import TextEmbed as TextEmbedPayload from .types import NoneEmbed as NoneEmbedPayload + from .types import SendableEmbed as SendableEmbedPayload + from .types import TextEmbed as TextEmbedPayload + from .types import WebsiteEmbed as WebsiteEmbedPayload __all__ = ("Embed", "WebsiteEmbed", "ImageEmbed", "TextEmbed", "NoneEmbed", "to_embed", "SendableEmbed") diff --git a/revolt/ext/commands/__init__.py b/revolt/ext/commands/__init__.py index 7900a65..b6529fd 100755 --- a/revolt/ext/commands/__init__.py +++ b/revolt/ext/commands/__init__.py @@ -1,9 +1,9 @@ from .checks import * from .client import * +from .cog import * from .command import * from .context import * from .converters import * from .errors import * from .group import * from .help import * -from .cog import * diff --git a/revolt/ext/commands/client.py b/revolt/ext/commands/client.py index 1a1c8b7..930b404 100755 --- a/revolt/ext/commands/client.py +++ b/revolt/ext/commands/client.py @@ -1,21 +1,23 @@ from __future__ import annotations -import traceback import sys -from typing import Any, Union, Protocol, runtime_checkable, Optional, TYPE_CHECKING -from typing_extensions import Self +import traceback from importlib import import_module +from typing import (TYPE_CHECKING, Any, Optional, Protocol, Union, + runtime_checkable) + +from typing_extensions import Self import revolt if TYPE_CHECKING: from .help import HelpCommand +from .cog import Cog from .command import Command from .context import Context from .errors import CheckError, CommandNotFound, MissingSetup from .view import StringView -from .cog import Cog __all__ = ( "CommandsMeta", diff --git a/revolt/ext/commands/cog.py b/revolt/ext/commands/cog.py index 02a229c..ec558e5 100755 --- a/revolt/ext/commands/cog.py +++ b/revolt/ext/commands/cog.py @@ -1,6 +1,6 @@ from __future__ import annotations -from distutils import command +from distutils import command from typing import TYPE_CHECKING, Any, Optional from .command import Command diff --git a/revolt/ext/commands/command.py b/revolt/ext/commands/command.py index 091e380..e537741 100755 --- a/revolt/ext/commands/command.py +++ b/revolt/ext/commands/command.py @@ -13,10 +13,10 @@ from .errors import InvalidLiteralArgument, UnionConverterError from .utils import evaluate_parameters if TYPE_CHECKING: - from .context import Context from .checks import Check - from .group import Group from .cog import Cog + from .context import Context + from .group import Group __all__ = ( "Command", diff --git a/revolt/ext/commands/group.py b/revolt/ext/commands/group.py index 5257198..7e2860d 100755 --- a/revolt/ext/commands/group.py +++ b/revolt/ext/commands/group.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Optional, Callable, Coroutine, Any +from typing import TYPE_CHECKING, Any, Callable, Coroutine, Optional from .command import Command diff --git a/revolt/ext/commands/help.py b/revolt/ext/commands/help.py index 40a3820..99d07b9 100755 --- a/revolt/ext/commands/help.py +++ b/revolt/ext/commands/help.py @@ -1,19 +1,21 @@ from __future__ import annotations + from abc import ABC, abstractmethod - -from typing import TYPE_CHECKING, TypedDict, Union, Optional -from typing_extensions import NotRequired from itertools import groupby +from typing import TYPE_CHECKING, Optional, TypedDict, Union + +from typing_extensions import NotRequired -from .utils import evaluate_parameters -from .command import Command, command from .client import CommandsClient +from .command import Command, command from .context import Context from .group import Group +from .utils import evaluate_parameters if TYPE_CHECKING: + from revolt import File, Message, Messageable, MessageReply, SendableEmbed + from .cog import Cog - from revolt import SendableEmbed, File, MessageReply, Message, Messageable __all__ = ("MessagePayload", "HelpCommand", "DefaultHelpCommand", "help_command_impl") diff --git a/revolt/ext/commands/utils.py b/revolt/ext/commands/utils.py index 0b2a9e0..0d1efe8 100755 --- a/revolt/ext/commands/utils.py +++ b/revolt/ext/commands/utils.py @@ -1,5 +1,5 @@ from inspect import Parameter -from typing import Iterable, Any +from typing import Any, Iterable __all__ = ("evaluate_parameters",) diff --git a/revolt/http.py b/revolt/http.py index ce22e7d..8d9b80f 100755 --- a/revolt/http.py +++ b/revolt/http.py @@ -25,14 +25,16 @@ if TYPE_CHECKING: from .types import Autumn as AutumnPayload from .types import Channel, DMChannel from .types import Embed as EmbedPayload - from .types import GetServerMembers, Invite + from .types import GetServerMembers, GroupDMChannel, Invite from .types import Masquerade as MasqueradePayload + from .types import Member from .types import Message as MessagePayload from .types import (MessageReplyPayload, MessageWithUserData, - PartialInvite, Role, Server, ServerBans, TextChannel) - from .types import User as UserPayload - from .types import UserProfile, VoiceChannel, GroupDMChannel, Member + PartialInvite, Role) from .types import SendableEmbed as SendableEmbedPayload + from .types import Server, ServerBans, TextChannel + from .types import User as UserPayload + from .types import UserProfile, VoiceChannel __all__ = ("HttpClient",) diff --git a/revolt/message.py b/revolt/message.py index ee1d121..de5baec 100755 --- a/revolt/message.py +++ b/revolt/message.py @@ -5,14 +5,14 @@ from typing import TYPE_CHECKING, NamedTuple, Optional from .asset import Asset, PartialAsset from .channel import Messageable -from .embed import to_embed, SendableEmbed +from .embed import SendableEmbed, to_embed if TYPE_CHECKING: from .state import State + from .types import Embed as EmbedPayload from .types import Masquerade as MasqueradePayload from .types import Message as MessagePayload from .types import MessageReplyPayload - from .types import Embed as EmbedPayload __all__ = ( diff --git a/revolt/role.py b/revolt/role.py index 0b2aebd..d9ecaeb 100755 --- a/revolt/role.py +++ b/revolt/role.py @@ -2,8 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, Optional -from .utils import Missing from .permissions import ChannelPermissions, ServerPermissions +from .utils import Missing if TYPE_CHECKING: from .server import Server diff --git a/revolt/server.py b/revolt/server.py index d1ac799..e5b9c04 100755 --- a/revolt/server.py +++ b/revolt/server.py @@ -13,11 +13,12 @@ if TYPE_CHECKING: from .channel import TextChannel from .member import Member from .state import State + from .types import Ban from .types import Category as CategoryPayload from .types import File as FilePayload from .types import Permission as PermissionPayload from .types import Server as ServerPayload - from .types import SystemMessagesConfig, Ban + from .types import SystemMessagesConfig __all__ = ("Server", "SystemMessages", "ServerBan") diff --git a/revolt/types/channel.py b/revolt/types/channel.py index 4d4e846..8ea520c 100755 --- a/revolt/types/channel.py +++ b/revolt/types/channel.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, Literal, TypedDict, Union + from typing_extensions import NotRequired if TYPE_CHECKING: diff --git a/revolt/types/embed.py b/revolt/types/embed.py index a8b7540..9bb3a9e 100755 --- a/revolt/types/embed.py +++ b/revolt/types/embed.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, Literal, TypedDict, Union + from typing_extensions import NotRequired if TYPE_CHECKING: diff --git a/revolt/types/gateway.py b/revolt/types/gateway.py index 703ee94..b3c40d8 100755 --- a/revolt/types/gateway.py +++ b/revolt/types/gateway.py @@ -4,17 +4,16 @@ from typing import TYPE_CHECKING, Literal, TypedDict, Union from .channel import (Channel, DMChannel, GroupDMChannel, SavedMessages, TextChannel, VoiceChannel) +from .file import File from .message import Message from .user import Status -from .file import File if TYPE_CHECKING: - from .member import Member, MemberID - from .server import Server - from .user import User - from .role import Permission from .category import Category - from .server import SystemMessagesConfig + from .member import Member, MemberID + from .role import Permission + from .server import Server, SystemMessagesConfig + from .user import User __all__ = ( "BasePayload", diff --git a/revolt/types/member.py b/revolt/types/member.py index 86d0bd6..acc0e7c 100755 --- a/revolt/types/member.py +++ b/revolt/types/member.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, TypedDict + from typing_extensions import NotRequired if TYPE_CHECKING: diff --git a/revolt/types/message.py b/revolt/types/message.py index b4aea7b..1b29d00 100755 --- a/revolt/types/message.py +++ b/revolt/types/message.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, TypedDict, Union + from typing_extensions import NotRequired if TYPE_CHECKING: diff --git a/revolt/types/server.py b/revolt/types/server.py index f1c71e5..115e779 100755 --- a/revolt/types/server.py +++ b/revolt/types/server.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, TypedDict + from typing_extensions import NotRequired if TYPE_CHECKING: diff --git a/revolt/types/user.py b/revolt/types/user.py index 657c7fe..df03691 100755 --- a/revolt/types/user.py +++ b/revolt/types/user.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, Literal, TypedDict + from typing_extensions import NotRequired if TYPE_CHECKING: diff --git a/revolt/utils.py b/revolt/utils.py index b8320e7..b99f0a2 100755 --- a/revolt/utils.py +++ b/revolt/utils.py @@ -1,9 +1,10 @@ import inspect +from contextlib import asynccontextmanager from operator import attrgetter from typing import Any, Callable, Coroutine, Iterable, TypeVar, Union -from contextlib import asynccontextmanager -from typing_extensions import ParamSpec + from aiohttp import ClientSession +from typing_extensions import ParamSpec __all__ = ("Missing", "copy_doc", "maybe_coroutine", "get", "client_session") diff --git a/revolt/websocket.py b/revolt/websocket.py index 23f550c..97b239c 100755 --- a/revolt/websocket.py +++ b/revolt/websocket.py @@ -3,10 +3,14 @@ from __future__ import annotations import asyncio import logging from copy import copy +from traceback import print_exception from typing import TYPE_CHECKING, Callable, cast -from traceback import print_exception; +from .channel import GroupDMChannel, TextChannel, VoiceChannel from .enums import RelationshipType +from .types import (ChannelCreateEventPayload, ChannelDeleteEventPayload, + ChannelDeleteTypingEventPayload, + ChannelStartTypingEventPayload, ChannelUpdateEventPayload) from .types import Message as MessagePayload from .types import (MessageDeleteEventPayload, MessageUpdateEventPayload, ServerDeleteEventPayload, ServerMemberJoinEventPayload, @@ -14,11 +18,8 @@ from .types import (MessageDeleteEventPayload, MessageUpdateEventPayload, ServerMemberUpdateEventPayload, ServerRoleDeleteEventPayload, ServerRoleUpdateEventPayload, ServerUpdateEventPayload, UserRelationshipEventPayload, - UserUpdateEventPayload, ChannelCreateEventPayload, ChannelDeleteEventPayload, - ChannelDeleteTypingEventPayload, - ChannelStartTypingEventPayload, ChannelUpdateEventPayload) + UserUpdateEventPayload) from .user import Status, UserProfile -from .channel import TextChannel, GroupDMChannel, VoiceChannel try: import ujson as json