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

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