From 6ffa81fdeeb96259c8067c4b45e94d8bb587096b Mon Sep 17 00:00:00 2001 From: cswimr Date: Sun, 26 Jan 2025 01:53:09 +0000 Subject: [PATCH] fix(bible): fix ruff errors --- bible/bible.py | 34 +++++++++++++++++----------------- bible/errors.py | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/bible/bible.py b/bible/bible.py index 9cf520b9..a1da890a 100644 --- a/bible/bible.py +++ b/bible/bible.py @@ -91,11 +91,11 @@ class Bible(commands.Cog): response.status, ) if response.status == 401: - raise bible.errors.Unauthorized() + raise bible.errors.UnauthorizedError() if response.status == 403: raise bible.errors.BibleAccessError() if response.status == 503: - raise bible.errors.ServiceUnavailable() + raise bible.errors.ServiceUnavailableError() return Version( bible_id, data["data"]["abbreviation"], @@ -137,13 +137,13 @@ class Bible(commands.Cog): if response.status == 400: raise bible.errors.InexplicableError() if response.status == 401: - raise bible.errors.Unauthorized() + raise bible.errors.UnauthorizedError() if response.status == 403: raise bible.errors.BibleAccessError() if response.status == 404: - raise bible.errors.NotFound() + raise bible.errors.NotFoundError() if response.status == 503: - raise bible.errors.ServiceUnavailable() + raise bible.errors.ServiceUnavailableError() fums_url = "https://fums.api.bible/f3" fums_params = { @@ -176,11 +176,11 @@ class Bible(commands.Cog): response.status, ) if response.status == 401: - raise bible.errors.Unauthorized() + raise bible.errors.UnauthorizedError() if response.status == 403: raise bible.errors.BibleAccessError() if response.status == 503: - raise bible.errors.ServiceUnavailable() + raise bible.errors.ServiceUnavailableError() return data["data"] async def _get_chapters(self, bible_id: str, book_id: str) -> dict: @@ -195,11 +195,11 @@ class Bible(commands.Cog): response.status, ) if response.status == 401: - raise bible.errors.Unauthorized() + raise bible.errors.UnauthorizedError() if response.status == 403: raise bible.errors.BibleAccessError() if response.status == 503: - raise bible.errors.ServiceUnavailable() + raise bible.errors.ServiceUnavailableError() return data["data"] async def _get_verses(self, bible_id: str, book_id: str, chapter: int) -> dict: @@ -214,11 +214,11 @@ class Bible(commands.Cog): response.status, ) if response.status == 401: - raise bible.errors.Unauthorized() + raise bible.errors.UnauthorizedError() if response.status == 403: raise bible.errors.BibleAccessError() if response.status == 503: - raise bible.errors.ServiceUnavailable() + raise bible.errors.ServiceUnavailableError() return data["data"] @commands.group(autohelp=True) @@ -251,10 +251,10 @@ class Bible(commands.Cog): passage = await self._get_passage(ctx, bible_id, f"{book_id}.{passage.replace(':', '.')}", False) except ( bible.errors.BibleAccessError, - bible.errors.NotFound, + bible.errors.NotFoundError, bible.errors.InexplicableError, - bible.errors.ServiceUnavailable, - bible.errors.Unauthorized, + bible.errors.ServiceUnavailableError, + bible.errors.UnauthorizedError, ) as e: await ctx.send(e.message) return @@ -294,10 +294,10 @@ class Bible(commands.Cog): passage = await self._get_passage(ctx, bible_id, verse, False) except ( bible.errors.BibleAccessError, - bible.errors.NotFound, + bible.errors.NotFoundError, bible.errors.InexplicableError, - bible.errors.ServiceUnavailable, - bible.errors.Unauthorized, + bible.errors.ServiceUnavailableError, + bible.errors.UnauthorizedError, ) as e: await ctx.send(e.message) return diff --git a/bible/errors.py b/bible/errors.py index 708ca863..954e92d4 100644 --- a/bible/errors.py +++ b/bible/errors.py @@ -10,7 +10,7 @@ class BibleAccessError(Exception): self.message = message -class Unauthorized(Exception): +class UnauthorizedError(Exception): def __init__( self, message: str = error("The API key for API.Bible is missing or invalid. Please report this to the bot owner.\nIf you are the bot owner, please check the documentation [here]()."), @@ -19,7 +19,7 @@ class Unauthorized(Exception): self.message = message -class NotFound(Exception): +class NotFoundError(Exception): def __init__( self, message: str = error("The requested passage was not found."), @@ -28,7 +28,7 @@ class NotFound(Exception): self.message = message -class ServiceUnavailable(Exception): +class ServiceUnavailableError(Exception): def __init__( self, message: str = error("The API.Bible service is currently unavailable."),