aboutsummaryrefslogtreecommitdiffstats
path: root/bot/exts
diff options
context:
space:
mode:
authorGravatar Matteo Bertucci <[email protected]>2021-08-09 16:45:45 +0200
committerGravatar GitHub <[email protected]>2021-08-09 16:45:45 +0200
commit67caea1f737f86c2394cc9a280acbfe71588c917 (patch)
tree8c4da29580d176964679a1b73e46ffc8b5e64215 /bot/exts
parentMerge #804 - circumvent URL injections in various cogs (diff)
parentMerge branch 'main' into remove-gpl-deps (diff)
Merge pull request #799 from python-discord/remove-gpl-deps
Remove gpl deps
Diffstat (limited to 'bot/exts')
-rw-r--r--bot/exts/christmas/advent_of_code/_helpers.py8
-rw-r--r--bot/exts/evergreen/help.py4
-rw-r--r--bot/exts/evergreen/snakes/_converter.py2
-rw-r--r--bot/exts/evergreen/trivia_quiz.py2
-rw-r--r--bot/exts/pride/pride_leader.py2
5 files changed, 9 insertions, 9 deletions
diff --git a/bot/exts/christmas/advent_of_code/_helpers.py b/bot/exts/christmas/advent_of_code/_helpers.py
index 96de90c4..e26a17ca 100644
--- a/bot/exts/christmas/advent_of_code/_helpers.py
+++ b/bot/exts/christmas/advent_of_code/_helpers.py
@@ -67,7 +67,7 @@ class UnexpectedResponseStatus(aiohttp.ClientError):
"""Raised when an unexpected redirect was detected."""
-class FetchingLeaderboardFailed(Exception):
+class FetchingLeaderboardFailedError(Exception):
"""Raised when one or more leaderboards could not be fetched at all."""
@@ -210,7 +210,7 @@ async def _fetch_leaderboard_data() -> typing.Dict[str, typing.Any]:
except UnexpectedRedirect:
if cookies["session"] == AdventOfCode.fallback_session:
log.error("It seems like the fallback cookie has expired!")
- raise FetchingLeaderboardFailed from None
+ raise FetchingLeaderboardFailedError from None
# If we're here, it means that the original session did not
# work. Let's fall back to the fallback session.
@@ -218,7 +218,7 @@ async def _fetch_leaderboard_data() -> typing.Dict[str, typing.Any]:
continue
except aiohttp.ClientError:
# Don't retry, something unexpected is wrong and it may not be the session.
- raise FetchingLeaderboardFailed from None
+ raise FetchingLeaderboardFailedError from None
else:
# Get the participants and store their current count.
board_participants = raw_data["members"]
@@ -227,7 +227,7 @@ async def _fetch_leaderboard_data() -> typing.Dict[str, typing.Any]:
break
else:
log.error(f"reached 'unreachable' state while fetching board `{leaderboard.id}`.")
- raise FetchingLeaderboardFailed
+ raise FetchingLeaderboardFailedError
log.info(f"Fetched leaderboard information for {len(participants)} participants")
return participants
diff --git a/bot/exts/evergreen/help.py b/bot/exts/evergreen/help.py
index 3c9ba4d2..bfb5db17 100644
--- a/bot/exts/evergreen/help.py
+++ b/bot/exts/evergreen/help.py
@@ -8,7 +8,7 @@ from typing import List, NamedTuple, Union
from discord import Colour, Embed, HTTPException, Message, Reaction, User
from discord.ext import commands
from discord.ext.commands import CheckFailure, Cog as DiscordCog, Command, Context
-from fuzzywuzzy import fuzz, process
+from rapidfuzz import process
from bot import constants
from bot.bot import Bot
@@ -159,7 +159,7 @@ class HelpSession:
# Combine command and cog names
choices = list(self._bot.all_commands) + list(self._bot.cogs)
- result = process.extractBests(query, choices, scorer=fuzz.ratio, score_cutoff=90)
+ result = process.extract(query, choices, score_cutoff=90)
raise HelpQueryNotFound(f'Query "{query}" not found.', dict(result))
diff --git a/bot/exts/evergreen/snakes/_converter.py b/bot/exts/evergreen/snakes/_converter.py
index 26bde611..c8d1909b 100644
--- a/bot/exts/evergreen/snakes/_converter.py
+++ b/bot/exts/evergreen/snakes/_converter.py
@@ -5,7 +5,7 @@ from typing import Iterable, List
import discord
from discord.ext.commands import Context, Converter
-from fuzzywuzzy import fuzz
+from rapidfuzz import fuzz
from bot.exts.evergreen.snakes._utils import SNAKE_RESOURCES
from bot.utils import disambiguate
diff --git a/bot/exts/evergreen/trivia_quiz.py b/bot/exts/evergreen/trivia_quiz.py
index 28924aed..bc25cbf7 100644
--- a/bot/exts/evergreen/trivia_quiz.py
+++ b/bot/exts/evergreen/trivia_quiz.py
@@ -9,7 +9,7 @@ from typing import Callable, List, Optional
import discord
from discord.ext import commands
-from fuzzywuzzy import fuzz
+from rapidfuzz import fuzz
from bot.bot import Bot
from bot.constants import Colours, NEGATIVE_REPLIES, Roles
diff --git a/bot/exts/pride/pride_leader.py b/bot/exts/pride/pride_leader.py
index c3426ad1..8e88183b 100644
--- a/bot/exts/pride/pride_leader.py
+++ b/bot/exts/pride/pride_leader.py
@@ -6,7 +6,7 @@ from typing import Optional
import discord
from discord.ext import commands
-from fuzzywuzzy import fuzz
+from rapidfuzz import fuzz
from bot import bot
from bot import constants