Consistent use of __all__ to prevent merge conflicts.

This commit is contained in:
Rapptz
2019-04-20 17:20:58 -04:00
parent c6410ea9ab
commit 919dbcafb3
12 changed files with 130 additions and 36 deletions

View File

@ -27,17 +27,40 @@ DEALINGS IN THE SOFTWARE.
from discord.errors import DiscordException
__all__ = ['CommandError', 'MissingRequiredArgument', 'BadArgument',
'PrivateMessageOnly', 'NoPrivateMessage', 'CheckFailure',
'CommandNotFound', 'DisabledCommand', 'CommandInvokeError',
'TooManyArguments','UserInputError', 'CommandOnCooldown',
'NotOwner', 'MissingRole', 'BotMissingRole', 'MissingAnyRole',
'BotMissingAnyRole','MissingPermissions', 'BotMissingPermissions',
'NSFWChannelRequired', 'ConversionError', 'BadUnionArgument',
'ArgumentParsingError', 'UnexpectedQuoteError', 'InvalidEndOfQuotedStringError',
'ExpectedClosingQuoteError', 'ExtensionError', 'ExtensionAlreadyLoaded',
'ExtensionNotLoaded', 'NoEntryPointError', 'ExtensionFailed',
'ExtensionNotFound']
__all__ = (
'CommandError',
'MissingRequiredArgument',
'BadArgument',
'PrivateMessageOnly',
'NoPrivateMessage',
'CheckFailure',
'CommandNotFound',
'DisabledCommand',
'CommandInvokeError',
'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.