Consistent use of __all__ to prevent merge conflicts.

discord/activity.py

@@ -30,7 +30,12 @@ from .enums import ActivityType, try_enum
 from .colour import Colour
 from .utils import _get_as_snowflake
 
-__all__ = ['Activity', 'Streaming', 'Game', 'Spotify']
+__all__ = (
+    'Activity',
+    'Streaming',
+    'Game',
+    'Spotify',
+)
 
 """If curious, this is the current schema for an activity.
 

discord/channel.py

@@ -36,7 +36,7 @@ from .asset import Asset
 from .errors import ClientException, NoMoreItems
 from .webhook import Webhook
 
-__all__ = [
+__all__ = (
     'TextChannel',
     'VoiceChannel',
     'DMChannel',
@@ -44,7 +44,7 @@ __all__ = [
     'StoreChannel',
     'GroupChannel',
     '_channel_factory',
-]
+)
 
 async def _single_delete_strategy(messages):
     for m in messages:

discord/enums.py

@@ -26,11 +26,27 @@ DEALINGS IN THE SOFTWARE.
 
 from enum import Enum
 
-__all__ = ['ChannelType', 'MessageType', 'VoiceRegion', 'SpeakingState',
+__all__ = (
-           'VerificationLevel', 'ContentFilter', 'Status', 'DefaultAvatar',
+    'ChannelType',
-           'RelationshipType', 'AuditLogAction', 'AuditLogActionCategory',
+    'MessageType',
-           'UserFlags', 'ActivityType', 'HypeSquadHouse', 'NotificationLevel',
+    'VoiceRegion',
-           'PremiumType', 'UserContentFilter', 'FriendFlags', 'Theme']
+    'SpeakingState',
+    'VerificationLevel',
+    'ContentFilter',
+    'Status',
+    'DefaultAvatar',
+    'RelationshipType',
+    'AuditLogAction',
+    'AuditLogActionCategory',
+    'UserFlags',
+    'ActivityType',
+    'HypeSquadHouse',
+    'NotificationLevel',
+    'PremiumType',
+    'UserContentFilter',
+    'FriendFlags',
+    'Theme',
+)
 
 def fast_lookup(cls):
     # NOTE: implies hashable

discord/ext/commands/cog.py

@@ -28,7 +28,10 @@ import inspect
 import copy
 from ._types import _BaseCommand
 
-__all__ = ('CogMeta', 'Cog')
+__all__ = (
+    'CogMeta',
+    'Cog',
+)
 
 class CogMeta(type):
     """A　metaclass for defining a cog.

discord/ext/commands/converter.py

@@ -31,11 +31,24 @@ import discord
 
 from .errors import BadArgument, NoPrivateMessage
 
-__all__ = ['Converter', 'MemberConverter', 'UserConverter', 'MessageConverter',
+__all__ = (
-           'TextChannelConverter', 'InviteConverter', 'RoleConverter',
+    'Converter',
-           'GameConverter', 'ColourConverter', 'VoiceChannelConverter',
+    'MemberConverter',
-           'EmojiConverter', 'PartialEmojiConverter', 'CategoryChannelConverter',
+    'UserConverter',
-           'IDConverter', 'clean_content', 'Greedy']
+    'MessageConverter',
+    'TextChannelConverter',
+    'InviteConverter',
+    'RoleConverter',
+    'GameConverter',
+    'ColourConverter',
+    'VoiceChannelConverter',
+    'EmojiConverter',
+    'PartialEmojiConverter',
+    'CategoryChannelConverter',
+    'IDConverter',
+    'clean_content',
+    'Greedy',
+)
 
 def _get_from_guilds(bot, getter, argument):
     result = None

discord/ext/commands/cooldowns.py

@@ -27,7 +27,11 @@ DEALINGS IN THE SOFTWARE.
 import enum
 import time
 
-__all__ = ['BucketType', 'Cooldown', 'CooldownMapping']
+__all__ = (
+    'BucketType',
+    'Cooldown',
+    'CooldownMapping',
+)
 
 class BucketType(enum.Enum):
     default  = 0

discord/ext/commands/core.py

@@ -38,10 +38,25 @@ from . import converter as converters
 from ._types import _BaseCommand
 from .cog import Cog
 
-__all__ = ['Command', 'Group', 'GroupMixin', 'command', 'group',
+__all__ = (
-           'has_role', 'has_permissions', 'has_any_role', 'check',
+    'Command',
-           'bot_has_role', 'bot_has_permissions', 'bot_has_any_role',
+    'Group',
-           'cooldown', 'dm_only', 'guild_only', 'is_owner', 'is_nsfw']
+    'GroupMixin',
+    'command',
+    'group',
+    'has_role',
+    'has_permissions',
+    'has_any_role',
+    'check',
+    'bot_has_role',
+    'bot_has_permissions',
+    'bot_has_any_role',
+    'cooldown',
+    'dm_only',
+    'guild_only',
+    'is_owner',
+    'is_nsfw',
+)
 
 def wrap_callback(coro):
     @functools.wraps(coro)

discord/ext/commands/errors.py

@@ -27,17 +27,40 @@ DEALINGS IN THE SOFTWARE.
 from discord.errors import DiscordException
 
 
-__all__ = ['CommandError', 'MissingRequiredArgument', 'BadArgument',
+__all__ = (
-           'PrivateMessageOnly', 'NoPrivateMessage', 'CheckFailure',
+    'CommandError',
-           'CommandNotFound', 'DisabledCommand', 'CommandInvokeError',
+    'MissingRequiredArgument',
-           'TooManyArguments','UserInputError', 'CommandOnCooldown',
+    'BadArgument',
-           'NotOwner', 'MissingRole', 'BotMissingRole', 'MissingAnyRole',
+    'PrivateMessageOnly',
-           'BotMissingAnyRole','MissingPermissions', 'BotMissingPermissions',
+    'NoPrivateMessage',
-           'NSFWChannelRequired', 'ConversionError', 'BadUnionArgument',
+    'CheckFailure',
-           'ArgumentParsingError', 'UnexpectedQuoteError', 'InvalidEndOfQuotedStringError',
+    'CommandNotFound',
-           'ExpectedClosingQuoteError', 'ExtensionError', 'ExtensionAlreadyLoaded',
+    'DisabledCommand',
-           'ExtensionNotLoaded', 'NoEntryPointError', 'ExtensionFailed',
+    'CommandInvokeError',
-           'ExtensionNotFound']
+    'TooManyArguments',
+    'UserInputError',
+    'CommandOnCooldown',
+    'NotOwner',
+    'MissingRole',
+    'BotMissingRole',
+    'MissingAnyRole',
+    'BotMissingAnyRole',
+    'MissingPermissions',
+    'BotMissingPermissions',
+    'NSFWChannelRequired',
+    'ConversionError',
+    'BadUnionArgument',
+    'ArgumentParsingError',
+    'UnexpectedQuoteError',
+    'InvalidEndOfQuotedStringError',
+    'ExpectedClosingQuoteError',
+    'ExtensionError',
+    'ExtensionAlreadyLoaded',
+    'ExtensionNotLoaded',
+    'NoEntryPointError',
+    'ExtensionFailed',
+    'ExtensionNotFound',
+)
 
 class CommandError(DiscordException):
     r"""The base exception type for all command related errors.

discord/ext/commands/help.py

@@ -33,12 +33,12 @@ import discord.utils
 from .core import Group, Command
 from .errors import CommandError
 
-__all__ = [
+__all__ = (
     'Paginator',
     'HelpCommand',
     'DefaultHelpCommand',
     'MinimalHelpCommand',
-]
+)
 
 # help -> shows info of bot on top/bottom and lists subcommands
 # help command -> shows detailed info of command

discord/gateway.py

@@ -44,8 +44,13 @@ from .errors import ConnectionClosed, InvalidArgument
 
 log = logging.getLogger(__name__)
 
-__all__ = ['DiscordWebSocket', 'KeepAliveHandler', 'VoiceKeepAliveHandler',
+__all__ = (
-           'DiscordVoiceWebSocket', 'ResumeWebSocket']
+    'DiscordWebSocket',
+    'KeepAliveHandler',
+    'VoiceKeepAliveHandler',
+    'DiscordVoiceWebSocket',
+    'ResumeWebSocket',
+)
 
 class ResumeWebSocket(Exception):
     """Signals to initialise via RESUME opcode instead of IDENTIFY."""

discord/player.py

@@ -37,7 +37,12 @@ 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.

discord/webhook.py

@@ -36,7 +36,12 @@ from .errors import InvalidArgument, HTTPException, Forbidden, NotFound
 from .user import BaseUser, User
 from .asset import Asset
 
-__all__ = ['WebhookAdapter', 'AsyncWebhookAdapter', 'RequestsWebhookAdapter', 'Webhook']
+__all__ = (
+    'WebhookAdapter',
+    'AsyncWebhookAdapter',
+    'RequestsWebhookAdapter',
+    'Webhook',
+)
 
 class WebhookAdapter:
     """Base class for all webhook adapters.