From d3f4e3d1f3dba96984b5f1f273a65e2369270624 Mon Sep 17 00:00:00 2001 From: Adriene Hutchins Date: Wed, 8 Apr 2020 22:05:37 -0400 Subject: [PATCH] Uhhh changes???? --- extensions/models/regex.py | 2 +- extensions/search.py | 6 +++--- main.py | 4 ++-- tests/test_regex.py | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/extensions/models/regex.py b/extensions/models/regex.py index 99f2eaa..9378d55 100644 --- a/extensions/models/regex.py +++ b/extensions/models/regex.py @@ -152,5 +152,5 @@ I | X ) -def setup(): +def setup(bot): pass diff --git a/extensions/search.py b/extensions/search.py index 71bf5b9..04772b5 100644 --- a/extensions/search.py +++ b/extensions/search.py @@ -13,7 +13,7 @@ import html2text import re from urllib.parse import quote_plus -from extensions.models import SearchExceptions +from extensions.models import searchexceptions from extensions.models.regex import nono_re @@ -49,7 +49,7 @@ class Search(commands.Cog, name="Basic"): # NSFW Filtering if nono_re.match(query) and not is_nsfw: - raise SearchExceptions.SafesearchFail('Query had NSFW.') + raise searchexceptions.SafesearchFail('Query had NSFW.') base = "https://api.qwant.com/api" @@ -213,7 +213,7 @@ class Search(commands.Cog, name="Basic"): await self._basic_search( ctx, ctx.message.content[len(ctx.prefix):] ) - except SearchExceptions.SafesearchFail: + except searchexceptions.SafesearchFail: await ctx.send( "**Sorry!** That query included language " "we cannot accept in a non-NSFW channel. " diff --git a/main.py b/main.py index 7c9f3fc..ac920b7 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ import discord from discord.ext import commands import rethinkdb -from extensions.models import SearchExceptions +from extensions.models import searchexceptions class Bot(commands.Bot): @@ -270,7 +270,7 @@ async def on_command_error(ctx, error): f"**Missing Argument!** A `{error.param.name}` is needed." ) - elif isinstance(error, SearchExceptions.SafesearchFail): + elif isinstance(error, searchexceptions.SafesearchFail): await ctx.send( "**Sorry!** That query included language " "we cannot accept in a non-NSFW channel. " diff --git a/tests/test_regex.py b/tests/test_regex.py index 894743e..24d49dd 100644 --- a/tests/test_regex.py +++ b/tests/test_regex.py @@ -2,6 +2,8 @@ import pytest import discord.ext.test as dpytest +import extensions.models.regex + @pytest.mark.asyncio async def test_regex(): # bot = main.Bot()