diff options
| author | 2021-07-07 18:21:06 +0300 | |
|---|---|---|
| committer | 2021-07-07 18:21:06 +0300 | |
| commit | 2ff595670b0603fe9e97d16ffcc2c04457fea1c5 (patch) | |
| tree | 2a9c2d0ea1a030311ff6da300029ff48b9ae67ff | |
| parent | Drops AIOPing Dependency (diff) | |
Fixes N818 Compliance
Renames a couple exceptions to include the error suffix, as enforced by
N818.
Signed-off-by: Hassan Abouelela <[email protected]>
| -rw-r--r-- | bot/errors.py | 2 | ||||
| -rw-r--r-- | bot/exts/backend/error_handler.py | 4 | ||||
| -rw-r--r-- | bot/exts/moderation/infraction/_utils.py | 4 | ||||
| -rw-r--r-- | bot/pagination.py | 4 | ||||
| -rw-r--r-- | tests/bot/exts/backend/test_error_handler.py | 4 | 
5 files changed, 9 insertions, 9 deletions
| diff --git a/bot/errors.py b/bot/errors.py index 3544c6320..46efb6d4f 100644 --- a/bot/errors.py +++ b/bot/errors.py @@ -22,7 +22,7 @@ class LockedResourceError(RuntimeError):          ) -class InvalidInfractedUser(Exception): +class InvalidInfractedUserError(Exception):      """      Exception raised upon attempt of infracting an invalid user. diff --git a/bot/exts/backend/error_handler.py b/bot/exts/backend/error_handler.py index d8de177f5..7ef55af45 100644 --- a/bot/exts/backend/error_handler.py +++ b/bot/exts/backend/error_handler.py @@ -10,7 +10,7 @@ from bot.api import ResponseCodeError  from bot.bot import Bot  from bot.constants import Colours, Icons, MODERATION_ROLES  from bot.converters import TagNameConverter -from bot.errors import InvalidInfractedUser, LockedResourceError +from bot.errors import InvalidInfractedUserError, LockedResourceError  from bot.utils.checks import ContextCheckFailure  log = logging.getLogger(__name__) @@ -76,7 +76,7 @@ class ErrorHandler(Cog):                  await self.handle_api_error(ctx, e.original)              elif isinstance(e.original, LockedResourceError):                  await ctx.send(f"{e.original} Please wait for it to finish and try again later.") -            elif isinstance(e.original, InvalidInfractedUser): +            elif isinstance(e.original, InvalidInfractedUserError):                  await ctx.send(f"Cannot infract that user. {e.original.reason}")              else:                  await self.handle_unexpected_error(ctx, e.original) diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py index e4eb7f79c..adbc641fa 100644 --- a/bot/exts/moderation/infraction/_utils.py +++ b/bot/exts/moderation/infraction/_utils.py @@ -7,7 +7,7 @@ from discord.ext.commands import Context  from bot.api import ResponseCodeError  from bot.constants import Colours, Icons -from bot.errors import InvalidInfractedUser +from bot.errors import InvalidInfractedUserError  log = logging.getLogger(__name__) @@ -85,7 +85,7 @@ async def post_infraction(      """Posts an infraction to the API."""      if isinstance(user, (discord.Member, discord.User)) and user.bot:          log.trace(f"Posting of {infr_type} infraction for {user} to the API aborted. User is a bot.") -        raise InvalidInfractedUser(user) +        raise InvalidInfractedUserError(user)      log.trace(f"Posting {infr_type} infraction for {user} to the API.") diff --git a/bot/pagination.py b/bot/pagination.py index 1c5b94b07..fbab74021 100644 --- a/bot/pagination.py +++ b/bot/pagination.py @@ -22,7 +22,7 @@ PAGINATION_EMOJI = (FIRST_EMOJI, LEFT_EMOJI, RIGHT_EMOJI, LAST_EMOJI, DELETE_EMO  log = logging.getLogger(__name__) -class EmptyPaginatorEmbed(Exception): +class EmptyPaginatorEmbedError(Exception):      """Raised when attempting to paginate with empty contents."""      pass @@ -233,7 +233,7 @@ class LinePaginator(Paginator):          if not lines:              if exception_on_empty_embed:                  log.exception("Pagination asked for empty lines iterable") -                raise EmptyPaginatorEmbed("No lines to paginate") +                raise EmptyPaginatorEmbedError("No lines to paginate")              log.debug("No lines to add to paginator, adding '(nothing to display)' message")              lines.append("(nothing to display)") diff --git a/tests/bot/exts/backend/test_error_handler.py b/tests/bot/exts/backend/test_error_handler.py index bd4fb5942..944cef6ca 100644 --- a/tests/bot/exts/backend/test_error_handler.py +++ b/tests/bot/exts/backend/test_error_handler.py @@ -4,7 +4,7 @@ from unittest.mock import AsyncMock, MagicMock, call, patch  from discord.ext.commands import errors  from bot.api import ResponseCodeError -from bot.errors import InvalidInfractedUser, LockedResourceError +from bot.errors import InvalidInfractedUserError, LockedResourceError  from bot.exts.backend.error_handler import ErrorHandler, setup  from bot.exts.info.tags import Tags  from bot.exts.moderation.silence import Silence @@ -130,7 +130,7 @@ class ErrorHandlerTests(unittest.IsolatedAsyncioTestCase):                  "expect_mock_call": "send"              },              { -                "args": (self.ctx, errors.CommandInvokeError(InvalidInfractedUser(self.ctx.author))), +                "args": (self.ctx, errors.CommandInvokeError(InvalidInfractedUserError(self.ctx.author))),                  "expect_mock_call": "send"              }          ) | 
