matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Consistent use of __all__ to prevent merge conflicts.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
discord/activity.py
View File

@@ -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.

4
discord/channel.py
View File

@@ -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:

26
discord/enums.py
View File

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

5
discord/ext/commands/cog.py
View File

@@ -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.

23
discord/ext/commands/converter.py
View File

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

6
discord/ext/commands/cooldowns.py
View File

@@ -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

23
discord/ext/commands/core.py
View File

@@ -38,10 +38,25 @@ from . import converter as converters
from ._types import _BaseCommand
from .cog import Cog
__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', 'dm_only', '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',
'dm_only',
'guild_only',
'is_owner',
'is_nsfw',
)
def wrap_callback(coro):
@functools.wraps(coro)

45
discord/ext/commands/errors.py
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.

4
discord/ext/commands/help.py
View File

@@ -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

9
discord/gateway.py
View File

@@ -44,8 +44,13 @@ from .errors import ConnectionClosed, InvalidArgument
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."""

7
discord/player.py
View File

@@ -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.

7
discord/webhook.py
View File

@@ -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.