diff --git a/discord/__main__.py b/discord/__main__.py index 6be6fc6c6..88837c797 100644 --- a/discord/__main__.py +++ b/discord/__main__.py @@ -197,7 +197,7 @@ def newbot(parser, args): with open(str(new_directory / 'config.py'), 'w', encoding='utf-8') as fp: fp.write('token = "place your token here"\ncogs = []\n') except OSError as e: - parser.error('could not create config file ({})'.format(e)) + parser.error('could not create config file ({})'.format(e)) try: with open(str(new_directory / 'bot.py'), 'w', encoding='utf-8') as fp: diff --git a/discord/abc.py b/discord/abc.py index 002980a4e..d4aa49566 100644 --- a/discord/abc.py +++ b/discord/abc.py @@ -742,7 +742,7 @@ class Messageable(metaclass=abc.ABCMeta): try: data = await state.http.send_files(channel.id, files=[(file.open_file(), file.filename)], - content=content, tts=tts, embed=embed, nonce=nonce) + content=content, tts=tts, embed=embed, nonce=nonce) finally: file.close() @@ -753,7 +753,7 @@ class Messageable(metaclass=abc.ABCMeta): try: param = [(f.open_file(), f.filename) for f in files] data = await state.http.send_files(channel.id, files=param, content=content, tts=tts, - embed=embed, nonce=nonce) + embed=embed, nonce=nonce) finally: for f in files: f.close() diff --git a/discord/calls.py b/discord/calls.py index bbffa7daa..44b8f4db5 100644 --- a/discord/calls.py +++ b/discord/calls.py @@ -153,4 +153,3 @@ class GroupCall: """ return self._voice_states.get(user.id) - diff --git a/discord/channel.py b/discord/channel.py index a79b3424e..adaefc06c 100644 --- a/discord/channel.py +++ b/discord/channel.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + """ The MIT License (MIT) @@ -79,8 +80,8 @@ class TextChannel(discord.abc.Messageable, discord.abc.GuildChannel, Hashable): top channel is position 0. """ - __slots__ = ( 'name', 'id', 'guild', 'topic', '_state', 'nsfw', - 'category_id', 'position', '_overwrites' ) + __slots__ = ('name', 'id', 'guild', 'topic', '_state', 'nsfw', + 'category_id', 'position', '_overwrites') def __init__(self, *, state, guild, data): self._state = state @@ -414,8 +415,8 @@ class VoiceChannel(discord.abc.Connectable, discord.abc.GuildChannel, Hashable): The channel's limit for number of members that can be in a voice channel. """ - __slots__ = ('name', 'id', 'guild', 'bitrate', 'user_limit', - '_state', 'position', '_overwrites', 'category_id' ) + __slots__ = ('name', 'id', 'guild', 'bitrate', 'user_limit', + '_state', 'position', '_overwrites', 'category_id') def __init__(self, *, state, guild, data): self._state = state diff --git a/discord/client.py b/discord/client.py index 440b5be32..7f99252b0 100644 --- a/discord/client.py +++ b/discord/client.py @@ -369,10 +369,8 @@ class Client: await self.ws.poll_event() except ResumeWebSocket: log.info('Got a request to RESUME the websocket.') - coro = DiscordWebSocket.from_client(self, shard_id=self.shard_id, - session=self.ws.session_id, - sequence=self.ws.sequence, - resume=True) + coro = DiscordWebSocket.from_client(self, shard_id=self.shard_id, session=self.ws.session_id, + sequence=self.ws.sequence, resume=True) self.ws = await asyncio.wait_for(coro, timeout=180.0, loop=self.loop) async def connect(self, *, reconnect=True): diff --git a/discord/embeds.py b/discord/embeds.py index 179250ca9..51670ff95 100644 --- a/discord/embeds.py +++ b/discord/embeds.py @@ -119,7 +119,7 @@ class Embed: # fill in the basic fields self.title = data.get('title', EmptyEmbed) - self.type = data.get('type', EmptyEmbed) + self.type = data.get('type', EmptyEmbed) self.description = data.get('description', EmptyEmbed) self.url = data.get('url', EmptyEmbed) diff --git a/discord/ext/commands/context.py b/discord/ext/commands/context.py index de37a1a7d..4beaa7d6b 100644 --- a/discord/ext/commands/context.py +++ b/discord/ext/commands/context.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + """ The MIT License (MIT) diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py index bb3a57084..880876a43 100644 --- a/discord/ext/commands/converter.py +++ b/discord/ext/commands/converter.py @@ -30,11 +30,11 @@ import inspect from .errors import BadArgument, NoPrivateMessage -__all__ = [ 'Converter', 'MemberConverter', 'UserConverter', - 'TextChannelConverter', 'InviteConverter', 'RoleConverter', - 'GameConverter', 'ColourConverter', 'VoiceChannelConverter', - 'EmojiConverter', 'PartialEmojiConverter', 'CategoryChannelConverter', - 'IDConverter', 'clean_content' ] +__all__ = ['Converter', 'MemberConverter', 'UserConverter', + 'TextChannelConverter', 'InviteConverter', 'RoleConverter', + 'GameConverter', 'ColourConverter', 'VoiceChannelConverter', + 'EmojiConverter', 'PartialEmojiConverter', 'CategoryChannelConverter', + 'IDConverter', 'clean_content'] def _get_from_guilds(bot, getter, argument): result = None diff --git a/discord/ext/commands/cooldowns.py b/discord/ext/commands/cooldowns.py index 32c4e65e6..196d00fcf 100644 --- a/discord/ext/commands/cooldowns.py +++ b/discord/ext/commands/cooldowns.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + """ The MIT License (MIT) diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py index 56c4baff4..a31986511 100644 --- a/discord/ext/commands/core.py +++ b/discord/ext/commands/core.py @@ -35,10 +35,10 @@ from .cooldowns import Cooldown, BucketType, CooldownMapping from .view import quoted_word from . import converter as converters -__all__ = [ 'Command', 'Group', 'GroupMixin', 'command', 'group', - 'has_role', 'has_permissions', 'has_any_role', 'check', - 'bot_has_role', 'bot_has_permissions', 'bot_has_any_role', - 'cooldown', 'guild_only', 'is_owner', 'is_nsfw', ] +__all__ = ['Command', 'Group', 'GroupMixin', 'command', 'group', + 'has_role', 'has_permissions', 'has_any_role', 'check', + 'bot_has_role', 'bot_has_permissions', 'bot_has_any_role', + 'cooldown', 'guild_only', 'is_owner', 'is_nsfw'] def wrap_callback(coro): @functools.wraps(coro) diff --git a/discord/ext/commands/errors.py b/discord/ext/commands/errors.py index d6443f2fa..195ca38d5 100644 --- a/discord/ext/commands/errors.py +++ b/discord/ext/commands/errors.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + """ The MIT License (MIT) @@ -26,7 +27,7 @@ DEALINGS IN THE SOFTWARE. from discord.errors import DiscordException -__all__ = [ 'CommandError', 'MissingRequiredArgument', 'BadArgument', +__all__ = ['CommandError', 'MissingRequiredArgument', 'BadArgument', 'NoPrivateMessage', 'CheckFailure', 'CommandNotFound', 'DisabledCommand', 'CommandInvokeError', 'TooManyArguments', 'UserInputError', 'CommandOnCooldown', 'NotOwner', @@ -171,7 +172,7 @@ class MissingPermissions(CheckFailure): missing = [perm.replace('_', ' ').replace('guild', 'server').title() for perm in missing_perms] if len(missing) > 2: - fmt = '{}, and {}'.format(", ".join(missing[:-1]), missing[-1]) + fmt = '{}, and {}'.format(", ".join(missing[:-1]), missing[-1]) else: fmt = ' and '.join(missing) message = 'You are missing {} permission(s) to run command.'.format(fmt) @@ -191,7 +192,7 @@ class BotMissingPermissions(CheckFailure): missing = [perm.replace('_', ' ').replace('guild', 'server').title() for perm in missing_perms] if len(missing) > 2: - fmt = '{}, and {}'.format(", ".join(missing[:-1]), missing[-1]) + fmt = '{}, and {}'.format(", ".join(missing[:-1]), missing[-1]) else: fmt = ' and '.join(missing) message = 'Bot requires {} permission(s) to run command.'.format(fmt) diff --git a/discord/ext/commands/view.py b/discord/ext/commands/view.py index 843dc9a39..e4c48db9d 100644 --- a/discord/ext/commands/view.py +++ b/discord/ext/commands/view.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + """ The MIT License (MIT) diff --git a/discord/gateway.py b/discord/gateway.py index c8bc17e5b..e5c4cb823 100644 --- a/discord/gateway.py +++ b/discord/gateway.py @@ -40,8 +40,8 @@ import struct log = logging.getLogger(__name__) -__all__ = [ 'DiscordWebSocket', 'KeepAliveHandler', 'VoiceKeepAliveHandler', - 'DiscordVoiceWebSocket', 'ResumeWebSocket' ] +__all__ = ['DiscordWebSocket', 'KeepAliveHandler', 'VoiceKeepAliveHandler', + 'DiscordVoiceWebSocket', 'ResumeWebSocket'] class ResumeWebSocket(Exception): """Signals to initialise via RESUME opcode instead of IDENTIFY.""" @@ -381,7 +381,7 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol): self.sequence = msg['s'] self.session_id = data['session_id'] log.info('Shard ID %s has connected to Gateway: %s (Session ID: %s).', - self.shard_id, ', '.join(trace), self.session_id) + self.shard_id, ', '.join(trace), self.session_id) if event == 'RESUMED': self._trace = trace = data.get('_trace', []) @@ -684,5 +684,3 @@ class DiscordVoiceWebSocket(websockets.client.WebSocketClientProtocol): self._keep_alive.stop() await super().close_connection(*args, **kwargs) - - diff --git a/discord/http.py b/discord/http.py index dac71681d..76bbf66f0 100644 --- a/discord/http.py +++ b/discord/http.py @@ -339,8 +339,7 @@ class HTTPClient: return self.request(r, data=form) async def ack_message(self, channel_id, message_id): - r = Route('POST', '/channels/{channel_id}/messages/{message_id}/ack', channel_id=channel_id, - message_id=message_id) + r = Route('POST', '/channels/{channel_id}/messages/{message_id}/ack', channel_id=channel_id, message_id=message_id) data = await self.request(r, json={'token': self._ack_token}) self._ack_token = data['token'] @@ -348,8 +347,7 @@ class HTTPClient: return self.request(Route('POST', '/guilds/{guild_id}/ack', guild_id=guild_id)) def delete_message(self, channel_id, message_id, *, reason=None): - r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id, - message_id=message_id) + r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id, message_id=message_id) return self.request(r, reason=reason) def delete_messages(self, channel_id, message_ids, *, reason=None): @@ -361,8 +359,7 @@ class HTTPClient: return self.request(r, json=payload, reason=reason) def edit_message(self, message_id, channel_id, **fields): - r = Route('PATCH', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id, - message_id=message_id) + r = Route('PATCH', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id, message_id=message_id) return self.request(r, json=fields) def add_reaction(self, message_id, channel_id, emoji): @@ -382,7 +379,7 @@ class HTTPClient: def get_reaction_users(self, message_id, channel_id, emoji, limit, after=None): r = Route('GET', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}', - channel_id=channel_id, message_id=message_id, emoji=emoji) + channel_id=channel_id, message_id=message_id, emoji=emoji) params = {'limit': limit} if after: @@ -415,11 +412,11 @@ class HTTPClient: def pin_message(self, channel_id, message_id): return self.request(Route('PUT', '/channels/{channel_id}/pins/{message_id}', - channel_id=channel_id, message_id=message_id)) + channel_id=channel_id, message_id=message_id)) def unpin_message(self, channel_id, message_id): return self.request(Route('DELETE', '/channels/{channel_id}/pins/{message_id}', - channel_id=channel_id, message_id=message_id)) + channel_id=channel_id, message_id=message_id)) def pins_from(self, channel_id): return self.request(Route('GET', '/channels/{channel_id}/pins', channel_id=channel_id)) @@ -584,7 +581,7 @@ class HTTPClient: return self.request(Route('GET', '/guilds/{guild_id}/vanity-url', guild_id=guild_id)) def change_vanity_code(self, guild_id, code, *, reason=None): - payload = { 'code': code } + payload = {'code': code} return self.request(Route('PATCH', '/guilds/{guild_id}/vanity-url', guild_id=guild_id), json=payload, reason=reason) def prune_members(self, guild_id, days, *, reason=None): @@ -622,7 +619,7 @@ class HTTPClient: return self.request(r, json=payload, reason=reason) def get_audit_logs(self, guild_id, limit=100, before=None, after=None, user_id=None, action_type=None): - params = { 'limit': limit } + params = {'limit': limit} if before: params['before'] = before if after: diff --git a/discord/invite.py b/discord/invite.py index 47d551595..acf7ce383 100644 --- a/discord/invite.py +++ b/discord/invite.py @@ -78,8 +78,8 @@ class Invite(Hashable): """ - __slots__ = ( 'max_age', 'code', 'guild', 'revoked', 'created_at', 'uses', - 'temporary', 'max_uses', 'inviter', 'channel', '_state' ) + __slots__ = ('max_age', 'code', 'guild', 'revoked', 'created_at', 'uses', + 'temporary', 'max_uses', 'inviter', 'channel', '_state') def __init__(self, *, state, data): self._state = state diff --git a/discord/iterators.py b/discord/iterators.py index 4d238512d..629d180a1 100644 --- a/discord/iterators.py +++ b/discord/iterators.py @@ -395,7 +395,7 @@ class AuditLogIterator(_AsyncIterator): async def _before_strategy(self, retrieve): before = self.before.id if self.before else None data = await self.request(self.guild.id, limit=retrieve, user_id=self.user_id, - action_type=self.action_type, before=before) + action_type=self.action_type, before=before) entries = data.get('audit_log_entries', []) if len(data) and entries: @@ -407,7 +407,7 @@ class AuditLogIterator(_AsyncIterator): async def _after_strategy(self, retrieve): after = self.after.id if self.after else None data = await self.request(self.guild.id, limit=retrieve, user_id=self.user_id, - action_type=self.action_type, after=after) + action_type=self.action_type, after=after) entries = data.get('audit_log_entries', []) if len(data) and entries: if self.limit is not None: diff --git a/discord/member.py b/discord/member.py index c714916d6..cbd2467bf 100644 --- a/discord/member.py +++ b/discord/member.py @@ -57,8 +57,8 @@ class VoiceState: is not currently in a voice channel. """ - __slots__ = ( 'session_id', 'deaf', 'mute', 'self_mute', - 'self_deaf', 'afk', 'channel' ) + __slots__ = ('session_id', 'deaf', 'mute', 'self_mute', + 'self_deaf', 'afk', 'channel') def __init__(self, *, data, channel=None): self.session_id = data.get('session_id') diff --git a/discord/message.py b/discord/message.py index c6559616a..f8af8e2f1 100644 --- a/discord/message.py +++ b/discord/message.py @@ -194,13 +194,13 @@ class Message: - ``cover_image``: A string representing the embed's image asset ID. """ - __slots__ = ( '_edited_timestamp', 'tts', 'content', 'channel', 'webhook_id', - 'mention_everyone', 'embeds', 'id', 'mentions', 'author', - '_cs_channel_mentions', '_cs_raw_mentions', 'attachments', - '_cs_clean_content', '_cs_raw_channel_mentions', 'nonce', 'pinned', - 'role_mentions', '_cs_raw_role_mentions', 'type', 'call', - '_cs_system_content', '_cs_guild', '_state', 'reactions', - 'application', 'activity' ) + __slots__ = ('_edited_timestamp', 'tts', 'content', 'channel', 'webhook_id', + 'mention_everyone', 'embeds', 'id', 'mentions', 'author', + '_cs_channel_mentions', '_cs_raw_mentions', 'attachments', + '_cs_clean_content', '_cs_raw_channel_mentions', 'nonce', 'pinned', + 'role_mentions', '_cs_raw_role_mentions', 'type', 'call', + '_cs_system_content', '_cs_guild', '_state', 'reactions', + 'application', 'activity') def __init__(self, *, state, channel, data): self._state = state diff --git a/discord/object.py b/discord/object.py index 4cdcd26b6..0bb102673 100644 --- a/discord/object.py +++ b/discord/object.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + """ The MIT License (MIT) diff --git a/discord/permissions.py b/discord/permissions.py index ea96e3998..518a31c76 100644 --- a/discord/permissions.py +++ b/discord/permissions.py @@ -493,7 +493,7 @@ class Permissions: # after these 32 bits, there's 21 more unused ones technically def augment_from_permissions(cls): - cls.VALID_NAMES = { name for name in dir(Permissions) if isinstance(getattr(Permissions, name), property) } + cls.VALID_NAMES = {name for name in dir(Permissions) if isinstance(getattr(Permissions, name), property)} # make descriptors for all the valid names for name in cls.VALID_NAMES: @@ -562,7 +562,7 @@ class PermissionOverwrite: """ allow = Permissions.none() - deny = Permissions.none() + deny = Permissions.none() for key, value in self._values.items(): if value is True: diff --git a/discord/player.py b/discord/player.py index c1337de86..a882287bc 100644 --- a/discord/player.py +++ b/discord/player.py @@ -36,7 +36,7 @@ from .opus import Encoder as OpusEncoder log = logging.getLogger(__name__) -__all__ = [ 'AudioSource', 'PCMAudio', 'FFmpegPCMAudio', 'PCMVolumeTransformer' ] +__all__ = ['AudioSource', 'PCMAudio', 'FFmpegPCMAudio', 'PCMVolumeTransformer'] class AudioSource: """Represents an audio stream. diff --git a/discord/raw_models.py b/discord/raw_models.py index 9bb7f77d8..22aad5ce6 100644 --- a/discord/raw_models.py +++ b/discord/raw_models.py @@ -64,7 +64,7 @@ class RawBulkMessageDeleteEvent: __slots__ = ('message_ids', 'channel_id', 'guild_id') def __init__(self, data): - self.message_ids = { int(x) for x in data.get('ids', []) } + self.message_ids = {int(x) for x in data.get('ids', [])} self.channel_id = int(data['channel_id']) try: diff --git a/discord/role.py b/discord/role.py index 151e2db6a..e134667bc 100644 --- a/discord/role.py +++ b/discord/role.py @@ -92,7 +92,7 @@ class Role(Hashable): """ __slots__ = ('id', 'name', 'permissions', 'color', 'colour', 'position', - 'managed', 'mentionable', 'hoist', 'guild', '_state' ) + 'managed', 'mentionable', 'hoist', 'guild', '_state') def __init__(self, *, guild, state, data): self.guild = guild diff --git a/discord/shard.py b/discord/shard.py index c06e6398f..f5b5ae103 100644 --- a/discord/shard.py +++ b/discord/shard.py @@ -76,10 +76,8 @@ class Shard: await self.ws.poll_event() except ResumeWebSocket: log.info('Got a request to RESUME the websocket at Shard ID %s.', self.id) - coro = DiscordWebSocket.from_client(self._client, resume=True, - shard_id=self.id, - session=self.ws.session_id, - sequence=self.ws.sequence) + coro = DiscordWebSocket.from_client(self._client, resume=True, shard_id=self.id, + session=self.ws.session_id, sequence=self.ws.sequence) self.ws = await asyncio.wait_for(coro, timeout=180.0, loop=self.loop) def get_future(self): diff --git a/discord/state.py b/discord/state.py index f02755322..f3038573b 100644 --- a/discord/state.py +++ b/discord/state.py @@ -405,7 +405,7 @@ class ConnectionState: raw = RawReactionClearEvent(data) self.dispatch('raw_reaction_clear', raw) - message = self._get_message(raw.message_id) + message = self._get_message(raw.message_id) if message is not None: old_reactions = message.reactions.copy() message.reactions.clear() @@ -457,7 +457,7 @@ class ConnectionState: self.user = ClientUser(state=self, data=data) def parse_channel_delete(self, data): - guild = self._get_guild(utils._get_as_snowflake(data, 'guild_id')) + guild = self._get_guild(utils._get_as_snowflake(data, 'guild_id')) channel_id = int(data['id']) if guild is not None: channel = guild.get_channel(channel_id) diff --git a/discord/webhook.py b/discord/webhook.py index 9d336aee4..7fdcf0f85 100644 --- a/discord/webhook.py +++ b/discord/webhook.py @@ -222,7 +222,7 @@ class RequestsWebhookAdapter(WebhookAdapter): data = utils.to_json(payload) if multipart is not None: - data = { 'payload_json': multipart.pop('payload_json') } + data = {'payload_json': multipart.pop('payload_json')} for tries in range(5): r = self.session.request(verb, url, headers=headers, data=data, files=multipart)