diff options
| -rw-r--r-- | discord/ext/commands/bot.py | 4 | ||||
| -rw-r--r-- | discord/ext/commands/core.py | 10 | ||||
| -rw-r--r-- | discord/ext/commands/formatter.py | 4 | ||||
| -rw-r--r-- | discord/gateway.py | 2 | ||||
| -rw-r--r-- | discord/http.py | 2 | ||||
| -rw-r--r-- | discord/iterators.py | 2 | ||||
| -rw-r--r-- | discord/shard.py | 4 | ||||
| -rw-r--r-- | discord/utils.py | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py index b934be9b..487636c5 100644 --- a/discord/ext/commands/bot.py +++ b/discord/ext/commands/bot.py @@ -340,7 +340,7 @@ class BotBase(GroupMixin): if len(data) == 0: return True - return (await discord.utils.async_all(f(ctx) for f in data)) + return await discord.utils.async_all(f(ctx) for f in data) async def is_owner(self, user): """Checks if a :class:`.User` or :class:`.Member` is the owner of @@ -895,7 +895,7 @@ class BotBase(GroupMixin): if ctx.command is not None: self.dispatch('command', ctx) try: - if (await self.can_run(ctx, call_once=True)): + if await self.can_run(ctx, call_once=True): await ctx.command.invoke(ctx) except CommandError as exc: await ctx.command.dispatch_error(ctx, exc) diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py index e2e68192..e871936c 100644 --- a/discord/ext/commands/core.py +++ b/discord/ext/commands/core.py @@ -349,7 +349,7 @@ class Command: argument = quoted_word(view) view.previous = previous - return (await self.do_conversion(ctx, converter, argument, param)) + return await self.do_conversion(ctx, converter, argument, param) async def _transform_greedy_pos(self, ctx, param, required, converter): view = ctx.view @@ -514,7 +514,7 @@ class Command: if not self.enabled: raise DisabledCommand('{0.name} command is disabled'.format(self)) - if not (await self.can_run(ctx)): + if not await self.can_run(ctx): raise CheckFailure('The check functions for command {0.qualified_name} failed.'.format(self)) async def call_before_hooks(self, ctx): @@ -793,7 +793,7 @@ class Command: ctx.command = self try: - if not (await ctx.bot.can_run(ctx)): + if not await ctx.bot.can_run(ctx): raise CheckFailure('The global check functions for command {0.qualified_name} failed.'.format(self)) cog = self.instance @@ -812,7 +812,7 @@ class Command: # since we have no checks, then we just return True. return True - return (await discord.utils.async_all(predicate(ctx) for predicate in predicates)) + return await discord.utils.async_all(predicate(ctx) for predicate in predicates) finally: ctx.command = original @@ -1376,7 +1376,7 @@ def is_owner(): """ async def predicate(ctx): - if not (await ctx.bot.is_owner(ctx.author)): + if not await ctx.bot.is_owner(ctx.author): raise NotOwner('You do not own this bot.') return True diff --git a/discord/ext/commands/formatter.py b/discord/ext/commands/formatter.py index f23a697b..ba120f92 100644 --- a/discord/ext/commands/formatter.py +++ b/discord/ext/commands/formatter.py @@ -228,7 +228,7 @@ class HelpFormatter: cmd = tup[1] try: - return (await cmd.can_run(self.context)) + return await cmd.can_run(self.context) except CommandError: return False @@ -274,7 +274,7 @@ class HelpFormatter: """ self.context = context self.command = command_or_bot - return (await self.format()) + return await self.format() async def format(self): """Handles the actual behaviour involved with formatting. diff --git a/discord/gateway.py b/discord/gateway.py index caca7e09..7e297d4f 100644 --- a/discord/gateway.py +++ b/discord/gateway.py @@ -229,7 +229,7 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol): except websockets.exceptions.ConnectionClosed: # ws got closed so let's just do a regular IDENTIFY connect. log.info('RESUME failed (the websocket decided to close) for Shard ID %s. Retrying.', shard_id) - return (await cls.from_client(client, shard_id=shard_id)) + return await cls.from_client(client, shard_id=shard_id) else: return ws diff --git a/discord/http.py b/discord/http.py index 7fc6abda..25d3e1a1 100644 --- a/discord/http.py +++ b/discord/http.py @@ -218,7 +218,7 @@ class HTTPClient: async def get_attachment(self, url): async with self._session.get(url) as resp: if resp.status == 200: - return (await resp.read()) + return await resp.read() elif resp.status == 404: raise NotFound(resp, 'attachment not found') elif resp.status == 403: diff --git a/discord/iterators.py b/discord/iterators.py index 629d180a..5ca5aabf 100644 --- a/discord/iterators.py +++ b/discord/iterators.py @@ -98,7 +98,7 @@ class _MappedAsyncIterator(_AsyncIterator): async def next(self): # this raises NoMoreItems and will propagate appropriately item = await self.iterator.next() - return (await maybe_coroutine(self.func, item)) + return await maybe_coroutine(self.func, item) class _FilteredAsyncIterator(_AsyncIterator): def __init__(self, iterator, predicate): diff --git a/discord/shard.py b/discord/shard.py index dfa255f5..eb9727b2 100644 --- a/discord/shard.py +++ b/discord/shard.py @@ -214,7 +214,7 @@ class AutoShardedClient(Client): except Exception: log.info('Failed to connect for shard_id: %s. Retrying...', shard_id) await asyncio.sleep(5.0, loop=self.loop) - return (await self.launch_shard(gateway, shard_id)) + return await self.launch_shard(gateway, shard_id) ws.token = self.http.token ws._connection = self._connection @@ -231,7 +231,7 @@ class AutoShardedClient(Client): except asyncio.TimeoutError: log.info('Timed out when connecting for shard_id: %s. Retrying...', shard_id) await asyncio.sleep(5.0, loop=self.loop) - return (await self.launch_shard(gateway, shard_id)) + return await self.launch_shard(gateway, shard_id) # keep reading the shard while others connect self.shards[shard_id] = ret = Shard(ws, self) diff --git a/discord/utils.py b/discord/utils.py index 705d5daa..bb1e4d53 100644 --- a/discord/utils.py +++ b/discord/utils.py @@ -271,7 +271,7 @@ def _parse_ratelimit_header(request): async def maybe_coroutine(f, *args, **kwargs): value = f(*args, **kwargs) if _isawaitable(value): - return (await value) + return await value else: return value |