From 97808e388fff138ea133aa316ed0acfb18c76085 Mon Sep 17 00:00:00 2001 From: codey Date: Wed, 12 Mar 2025 09:37:44 -0400 Subject: [PATCH] cleanup/minor --- api.py | 2 +- cogs/meme.py | 2 +- cogs/misc.py | 6 +++--- cogs/misc_util.py | 4 ++-- cogs/radio.py | 2 -- disc_havoc.py | 2 +- util/lovehate_db.py | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/api.py b/api.py index 43cc35e..0d91d6e 100644 --- a/api.py +++ b/api.py @@ -43,7 +43,7 @@ class API: def __init__(): - import util # pylint: disable=redefined-outer-name, reimported, import-outside-toplevel + import util importlib.reload(util) __init__() \ No newline at end of file diff --git a/cogs/meme.py b/cogs/meme.py index df1e06c..b81878f 100644 --- a/cogs/meme.py +++ b/cogs/meme.py @@ -224,7 +224,7 @@ class Meme(commands.Cog): for meme in memes: if not meme: continue - (meme_id, meme_title, meme_url) = meme # pylint: disable=unused-variable + (meme_id, meme_title, meme_url) = meme request = requests.get(meme_url, stream=True, timeout=(5, 30), headers=headers) if not request.status_code == 200: continue diff --git a/cogs/misc.py b/cogs/misc.py index bd057b9..7c1aaab 100644 --- a/cogs/misc.py +++ b/cogs/misc.py @@ -3,13 +3,13 @@ import traceback import urllib import datetime import random -from typing import Optional, LiteralString +from typing import Optional import logging import discord from cogs.misc_util import Util import aiosqlite as sqlite3 -from sh import cowsay as cow_say, fortune # pylint: disable=no-name-in-module -from discord.ext import bridge, commands, tasks +from sh import cowsay as cow_say, fortune +from discord.ext import bridge, commands from disc_havoc import Havoc from constructors import MiscException diff --git a/cogs/misc_util.py b/cogs/misc_util.py index 20b1848..16541f7 100644 --- a/cogs/misc_util.py +++ b/cogs/misc_util.py @@ -4,7 +4,7 @@ import traceback import random import datetime import pytz -from typing import Any, Optional, LiteralString, Union +from typing import Optional, LiteralString, Union import regex import aiosqlite as sqlite3 from aiohttp import ClientSession, ClientTimeout @@ -418,7 +418,7 @@ class Util: day=25, tzinfo=pytz.UTC, ) - td: datetime.timedelta = (xmas - today) # pylint: disable=superfluous-parens + td: datetime.timedelta = (xmas - today) days, hours, minutes, seconds, us, ms = self.tdTuple(td) return (days, hours, minutes, seconds, ms, us) diff --git a/cogs/radio.py b/cogs/radio.py index fea46f3..4a0ed62 100644 --- a/cogs/radio.py +++ b/cogs/radio.py @@ -115,8 +115,6 @@ class Radio(commands.Cog): # await vc.channel.set_status(f"Now playing: {np_track}") except: traceback.print_exc() - - # pylint: enable=superfluous-parens def cog_unload(self) -> None: """Run on Cog Unload""" diff --git a/disc_havoc.py b/disc_havoc.py index 7e398a1..d605159 100644 --- a/disc_havoc.py +++ b/disc_havoc.py @@ -62,7 +62,7 @@ class Havoc(bridge.Bot): load_method(f'cogs.{cog}') importlib.reload(api) - from api import API # pylint: disable=unused-import + from api import API api_config = hypercorn.config.Config() api_config.bind = ["10.10.10.100:5992"] api_instance = api.API(self) diff --git a/util/lovehate_db.py b/util/lovehate_db.py index 8acec53..a86745c 100644 --- a/util/lovehate_db.py +++ b/util/lovehate_db.py @@ -11,7 +11,7 @@ class DB: "sqlite_dbs", "lovehate.db") async def get_wholovehates(self, thing: str, loves: bool = False, - hates: bool = False) -> list[tuple]|bool: + hates: bool = False) -> Union[list[tuple], bool]: """ Get a list of users who have professed their love OR hatred for @@ -20,7 +20,7 @@ class DB: loves (bool): Are we looking for loves? hates (bool): ...or are we looking for hates? Returns: - list[tuple] + Union[list[tuple], bool] """ query: str = "SELECT display_name FROM lovehate WHERE thing LIKE ? AND flag = ?"