From d3dd221a9f94c7c608090af08a367df8069241f1 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 2 Apr 2022 00:38:38 +0200 Subject: [PATCH] Updated flake8 config --- .flake8 | 3 ++- __init__.py | 8 +------- administration/__init__.py | 3 +++ administration/permissions/__init__.py | 3 +++ administration/roles/__init__.py | 3 +++ administration/settings/__init__.py | 3 +++ administration/sudo/__init__.py | 3 +++ general/__init__.py | 14 ++++++++++++++ general/betheprofessional/__init__.py | 3 +++ general/custom_commands/__init__.py | 3 +++ general/discord_bot_token_deleter/__init__.py | 3 +++ general/news/__init__.py | 3 +++ general/polls/__init__.py | 3 +++ general/reactionpin/__init__.py | 3 +++ general/reactionrole/__init__.py | 3 +++ general/remind_me/__init__.py | 3 +++ general/utils/__init__.py | 3 +++ general/voice_channel/__init__.py | 3 +++ information/__init__.py | 3 +++ information/bot_info/__init__.py | 3 +++ information/heartbeat/__init__.py | 3 +++ information/help/__init__.py | 3 +++ information/inactivity/__init__.py | 3 +++ information/inactivity/models.py | 2 +- information/server_info/__init__.py | 3 +++ information/user_info/__init__.py | 3 +++ integrations/__init__.py | 3 +++ integrations/adventofcode/__init__.py | 5 ++++- integrations/adventofcode/cog.py | 12 ------------ integrations/cleverbot/__init__.py | 3 +++ integrations/cleverbot/api.py | 4 +--- integrations/python_docs/__init__.py | 3 +++ integrations/reddit/__init__.py | 3 +++ integrations/run_code/__init__.py | 3 +++ moderation/__init__.py | 17 +++++++++++++++++ moderation/autoclear/__init__.py | 3 +++ moderation/automod/__init__.py | 3 +++ moderation/autorole/__init__.py | 3 +++ moderation/invites/__init__.py | 3 +++ moderation/logging/__init__.py | 5 ++++- moderation/mediaonly/__init__.py | 3 +++ moderation/message/__init__.py | 3 +++ moderation/mod/__init__.py | 3 +++ moderation/role_notifications/__init__.py | 3 +++ moderation/spam_detection/__init__.py | 3 +++ moderation/threads/__init__.py | 3 +++ moderation/user_notes/__init__.py | 3 +++ moderation/verification/__init__.py | 3 +++ 48 files changed, 161 insertions(+), 26 deletions(-) diff --git a/.flake8 b/.flake8 index 19051bb97..2dfa3d371 100644 --- a/.flake8 +++ b/.flake8 @@ -1,3 +1,4 @@ [flake8] max-line-length = 120 -ignore = C812,C813,C815,C816,D,E800,F401,F403,F405,Q000,RST210,RST213,RST215,RST304,S311,WPS,W503 +ignore = C812,C813,C815,C816,Q000,RST210,RST213,RST215,RST304,W503 +extend-ignore = D,E800,S311,WPS diff --git a/__init__.py b/__init__.py index 1932e5546..517cc1246 100644 --- a/__init__.py +++ b/__init__.py @@ -1,7 +1 @@ -from . import translations as _ # isort: skip - -from .administration import * -from .general import * -from .information import * -from .integrations import * -from .moderation import * +from . import translations as _ # noqa diff --git a/administration/__init__.py b/administration/__init__.py index 44c9910cf..bc0941a4e 100644 --- a/administration/__init__.py +++ b/administration/__init__.py @@ -2,3 +2,6 @@ from .roles import RolesCog from .settings import SettingsCog from .sudo import SudoCog + + +__all__ = ["PermissionsCog", "RolesCog", "SettingsCog", "SudoCog"] diff --git a/administration/permissions/__init__.py b/administration/permissions/__init__.py index 0c01761a3..89664e393 100644 --- a/administration/permissions/__init__.py +++ b/administration/permissions/__init__.py @@ -1 +1,4 @@ from .cog import PermissionsCog + + +__all__ = ["PermissionsCog"] diff --git a/administration/roles/__init__.py b/administration/roles/__init__.py index 61f3e8e35..874230302 100644 --- a/administration/roles/__init__.py +++ b/administration/roles/__init__.py @@ -1 +1,4 @@ from .cog import RolesCog + + +__all__ = ["RolesCog"] diff --git a/administration/settings/__init__.py b/administration/settings/__init__.py index 8b0a5b1e0..0c2ed7297 100644 --- a/administration/settings/__init__.py +++ b/administration/settings/__init__.py @@ -1 +1,4 @@ from .cog import SettingsCog + + +__all__ = ["SettingsCog"] diff --git a/administration/sudo/__init__.py b/administration/sudo/__init__.py index 985d03cad..8213fe801 100644 --- a/administration/sudo/__init__.py +++ b/administration/sudo/__init__.py @@ -1 +1,4 @@ from .cog import SudoCog + + +__all__ = ["SudoCog"] diff --git a/general/__init__.py b/general/__init__.py index 3d2213841..c012cf439 100644 --- a/general/__init__.py +++ b/general/__init__.py @@ -8,3 +8,17 @@ from .remind_me import RemindMeCog from .utils import UtilsCog from .voice_channel import VoiceChannelCog + + +__all__ = [ + "BeTheProfessionalCog", + "CustomCommandsCog", + "DiscordBotTokenDeleterCog", + "NewsCog", + "PollsCog", + "ReactionPinCog", + "ReactionRoleCog", + "RemindMeCog", + "UtilsCog", + "VoiceChannelCog", +] diff --git a/general/betheprofessional/__init__.py b/general/betheprofessional/__init__.py index 9feb8e313..5646137d9 100644 --- a/general/betheprofessional/__init__.py +++ b/general/betheprofessional/__init__.py @@ -1 +1,4 @@ from .cog import BeTheProfessionalCog + + +__all__ = ["BeTheProfessionalCog"] diff --git a/general/custom_commands/__init__.py b/general/custom_commands/__init__.py index 547bbae92..ee2194353 100644 --- a/general/custom_commands/__init__.py +++ b/general/custom_commands/__init__.py @@ -1 +1,4 @@ from .cog import CustomCommandsCog + + +__all__ = ["CustomCommandsCog"] diff --git a/general/discord_bot_token_deleter/__init__.py b/general/discord_bot_token_deleter/__init__.py index 90a23c618..9101df845 100644 --- a/general/discord_bot_token_deleter/__init__.py +++ b/general/discord_bot_token_deleter/__init__.py @@ -1 +1,4 @@ from .cog import DiscordBotTokenDeleterCog + + +__all__ = ["DiscordBotTokenDeleterCog"] diff --git a/general/news/__init__.py b/general/news/__init__.py index 816d78140..e2bedcc88 100644 --- a/general/news/__init__.py +++ b/general/news/__init__.py @@ -1 +1,4 @@ from .cog import NewsCog + + +__all__ = ["NewsCog"] diff --git a/general/polls/__init__.py b/general/polls/__init__.py index ad187017a..e0ff70f17 100644 --- a/general/polls/__init__.py +++ b/general/polls/__init__.py @@ -1 +1,4 @@ from .cog import PollsCog + + +__all__ = ["PollsCog"] diff --git a/general/reactionpin/__init__.py b/general/reactionpin/__init__.py index 12e674e35..dcd8311f2 100644 --- a/general/reactionpin/__init__.py +++ b/general/reactionpin/__init__.py @@ -1 +1,4 @@ from .cog import ReactionPinCog + + +__all__ = ["ReactionPinCog"] diff --git a/general/reactionrole/__init__.py b/general/reactionrole/__init__.py index cea12717c..4f5235887 100644 --- a/general/reactionrole/__init__.py +++ b/general/reactionrole/__init__.py @@ -1 +1,4 @@ from .cog import ReactionRoleCog + + +__all__ = ["ReactionRoleCog"] diff --git a/general/remind_me/__init__.py b/general/remind_me/__init__.py index 42d380b3a..8c750d60d 100644 --- a/general/remind_me/__init__.py +++ b/general/remind_me/__init__.py @@ -1 +1,4 @@ from .cog import RemindMeCog + + +__all__ = ["RemindMeCog"] diff --git a/general/utils/__init__.py b/general/utils/__init__.py index 853401910..707467304 100644 --- a/general/utils/__init__.py +++ b/general/utils/__init__.py @@ -1 +1,4 @@ from .cog import UtilsCog + + +__all__ = ["UtilsCog"] diff --git a/general/voice_channel/__init__.py b/general/voice_channel/__init__.py index 3664bdffa..535a5f772 100644 --- a/general/voice_channel/__init__.py +++ b/general/voice_channel/__init__.py @@ -1 +1,4 @@ from .cog import VoiceChannelCog + + +__all__ = ["VoiceChannelCog"] diff --git a/information/__init__.py b/information/__init__.py index 8bc2e4150..4e68a70ec 100644 --- a/information/__init__.py +++ b/information/__init__.py @@ -4,3 +4,6 @@ from .inactivity import InactivityCog from .server_info import ServerInfoCog from .user_info import UserInfoCog + + +__all__ = ["BotInfoCog", "HeartbeatCog", "HelpCog", "InactivityCog", "ServerInfoCog", "UserInfoCog"] diff --git a/information/bot_info/__init__.py b/information/bot_info/__init__.py index 1f28fb370..9991c8995 100644 --- a/information/bot_info/__init__.py +++ b/information/bot_info/__init__.py @@ -1 +1,4 @@ from .cog import BotInfoCog + + +__all__ = ["BotInfoCog"] diff --git a/information/heartbeat/__init__.py b/information/heartbeat/__init__.py index 846a59a3b..fc06d3163 100644 --- a/information/heartbeat/__init__.py +++ b/information/heartbeat/__init__.py @@ -1 +1,4 @@ from .cog import HeartbeatCog + + +__all__ = ["HeartbeatCog"] diff --git a/information/help/__init__.py b/information/help/__init__.py index 0e7c03b2a..693493ddd 100644 --- a/information/help/__init__.py +++ b/information/help/__init__.py @@ -1 +1,4 @@ from .cog import HelpCog + + +__all__ = ["HelpCog"] diff --git a/information/inactivity/__init__.py b/information/inactivity/__init__.py index a75ea21cf..306262d5d 100644 --- a/information/inactivity/__init__.py +++ b/information/inactivity/__init__.py @@ -1 +1,4 @@ from .cog import InactivityCog + + +__all__ = ["InactivityCog"] diff --git a/information/inactivity/models.py b/information/inactivity/models.py index 52c16c79f..bbceddb62 100644 --- a/information/inactivity/models.py +++ b/information/inactivity/models.py @@ -5,7 +5,7 @@ from sqlalchemy import BigInteger, Column -from PyDrocsid.database import Base, UTCDateTime, db, db_wrapper +from PyDrocsid.database import Base, UTCDateTime, db class Activity(Base): diff --git a/information/server_info/__init__.py b/information/server_info/__init__.py index c2bce0044..515322333 100644 --- a/information/server_info/__init__.py +++ b/information/server_info/__init__.py @@ -1 +1,4 @@ from .cog import ServerInfoCog + + +__all__ = ["ServerInfoCog"] diff --git a/information/user_info/__init__.py b/information/user_info/__init__.py index 80c0f8df7..9f51578b2 100644 --- a/information/user_info/__init__.py +++ b/information/user_info/__init__.py @@ -1 +1,4 @@ from .cog import UserInfoCog + + +__all__ = ["UserInfoCog"] diff --git a/integrations/__init__.py b/integrations/__init__.py index 8a2be2540..9bb85d8c1 100644 --- a/integrations/__init__.py +++ b/integrations/__init__.py @@ -3,3 +3,6 @@ from .python_docs import PythonDocsCog from .reddit import RedditCog from .run_code import RunCodeCog + + +__all__ = ["AdventOfCodeCog", "CleverBotCog", "PythonDocsCog", "RedditCog", "RunCodeCog"] diff --git a/integrations/adventofcode/__init__.py b/integrations/adventofcode/__init__.py index 256e95224..e363cafea 100644 --- a/integrations/adventofcode/__init__.py +++ b/integrations/adventofcode/__init__.py @@ -1 +1,4 @@ -from .cog import AdventOfCodeCog, AOCConfig +from .cog import AdventOfCodeCog + + +__all__ = ["AdventOfCodeCog"] diff --git a/integrations/adventofcode/cog.py b/integrations/adventofcode/cog.py index da9e3f080..65d007f8e 100644 --- a/integrations/adventofcode/cog.py +++ b/integrations/adventofcode/cog.py @@ -146,18 +146,6 @@ def make_member_stats(member: dict) -> tuple[int, list[str]]: line += f" {d:2}d {h:2}h {m:2}m {s:2}s" stars.append(line) - # if completed: - # stars.append("-" * 37) - # line = "Avg" - # for part in part_avg: - # if not part: - # break - # - # delta = timedelta(seconds=sum(part) / len(part)) - # d, h, m, s = delta.days, delta.seconds // 3600, delta.seconds // 60 % 60, delta.seconds % 60 - # line += f" {d:2}d {h:2}h {m:2}m {s:2}s" - # stars.append(line) - return completed, stars diff --git a/integrations/cleverbot/__init__.py b/integrations/cleverbot/__init__.py index 1fff06009..00285e241 100644 --- a/integrations/cleverbot/__init__.py +++ b/integrations/cleverbot/__init__.py @@ -1 +1,4 @@ from .cog import CleverBotCog + + +__all__ = ["CleverBotCog"] diff --git a/integrations/cleverbot/api.py b/integrations/cleverbot/api.py index f09ec96f2..0b727b202 100755 --- a/integrations/cleverbot/api.py +++ b/integrations/cleverbot/api.py @@ -121,9 +121,7 @@ def say(self, msg): return out def set_cookie(self, name, value): - # noinspection PyProtectedMember,PyUnresolvedReferences - # skipcq: PYL-W0212 - self.session.cookies._cookies["www.cleverbot.com"]["/"][name] = http.cookiejar.Cookie( + self.session.cookies._cookies["www.cleverbot.com"]["/"][name] = http.cookiejar.Cookie( # noqa version=0, name=name, value=value, diff --git a/integrations/python_docs/__init__.py b/integrations/python_docs/__init__.py index 60cca07de..1e22d8a47 100644 --- a/integrations/python_docs/__init__.py +++ b/integrations/python_docs/__init__.py @@ -1 +1,4 @@ from .cog import PythonDocsCog + + +__all__ = ["PythonDocsCog"] diff --git a/integrations/reddit/__init__.py b/integrations/reddit/__init__.py index 5d69792ac..29effe9d4 100644 --- a/integrations/reddit/__init__.py +++ b/integrations/reddit/__init__.py @@ -1 +1,4 @@ from .cog import RedditCog + + +__all__ = ["RedditCog"] diff --git a/integrations/run_code/__init__.py b/integrations/run_code/__init__.py index fec261371..49aac41e8 100644 --- a/integrations/run_code/__init__.py +++ b/integrations/run_code/__init__.py @@ -1 +1,4 @@ from .cog import RunCodeCog + + +__all__ = ["RunCodeCog"] diff --git a/moderation/__init__.py b/moderation/__init__.py index 6d1482604..e6d2e6c5a 100644 --- a/moderation/__init__.py +++ b/moderation/__init__.py @@ -11,3 +11,20 @@ from .threads import ThreadsCog from .user_notes import UserNoteCog from .verification import VerificationCog + + +__all__ = [ + "AutoClearCog", + "AutoModCog", + "AutoRoleCog", + "InvitesCog", + "LoggingCog", + "MediaOnlyCog", + "MessageCog", + "ModCog", + "RoleNotificationsCog", + "SpamDetectionCog", + "ThreadsCog", + "UserNoteCog", + "VerificationCog", +] diff --git a/moderation/autoclear/__init__.py b/moderation/autoclear/__init__.py index a368b9e6a..fc209fb5a 100644 --- a/moderation/autoclear/__init__.py +++ b/moderation/autoclear/__init__.py @@ -1 +1,4 @@ from .cog import AutoClearCog + + +__all__ = ["AutoClearCog"] diff --git a/moderation/automod/__init__.py b/moderation/automod/__init__.py index 9b3db127e..e5515330d 100644 --- a/moderation/automod/__init__.py +++ b/moderation/automod/__init__.py @@ -1 +1,4 @@ from .cog import AutoModCog + + +__all__ = ["AutoModCog"] diff --git a/moderation/autorole/__init__.py b/moderation/autorole/__init__.py index 3c42f1ded..a516a64f9 100644 --- a/moderation/autorole/__init__.py +++ b/moderation/autorole/__init__.py @@ -1 +1,4 @@ from .cog import AutoRoleCog + + +__all__ = ["AutoRoleCog"] diff --git a/moderation/invites/__init__.py b/moderation/invites/__init__.py index 8d657923b..cd175958d 100644 --- a/moderation/invites/__init__.py +++ b/moderation/invites/__init__.py @@ -1 +1,4 @@ from .cog import InvitesCog + + +__all__ = ["InvitesCog"] diff --git a/moderation/logging/__init__.py b/moderation/logging/__init__.py index ae9786992..32032fc9a 100644 --- a/moderation/logging/__init__.py +++ b/moderation/logging/__init__.py @@ -1 +1,4 @@ -from .cog import LoggingCog, send_to_changelog +from .cog import LoggingCog + + +__all__ = ["LoggingCog"] diff --git a/moderation/mediaonly/__init__.py b/moderation/mediaonly/__init__.py index 37b157a5a..03218cdb5 100644 --- a/moderation/mediaonly/__init__.py +++ b/moderation/mediaonly/__init__.py @@ -1 +1,4 @@ from .cog import MediaOnlyCog + + +__all__ = ["MediaOnlyCog"] diff --git a/moderation/message/__init__.py b/moderation/message/__init__.py index 6191eeae8..45205c5f6 100644 --- a/moderation/message/__init__.py +++ b/moderation/message/__init__.py @@ -1 +1,4 @@ from .cog import MessageCog + + +__all__ = ["MessageCog"] diff --git a/moderation/mod/__init__.py b/moderation/mod/__init__.py index 4325c8caa..2e8002f62 100644 --- a/moderation/mod/__init__.py +++ b/moderation/mod/__init__.py @@ -1 +1,4 @@ from .cog import ModCog + + +__all__ = ["ModCog"] diff --git a/moderation/role_notifications/__init__.py b/moderation/role_notifications/__init__.py index 8d4226ca1..31003ce7d 100644 --- a/moderation/role_notifications/__init__.py +++ b/moderation/role_notifications/__init__.py @@ -1 +1,4 @@ from .cog import RoleNotificationsCog + + +__all__ = ["RoleNotificationsCog"] diff --git a/moderation/spam_detection/__init__.py b/moderation/spam_detection/__init__.py index 857683145..b3b1c5785 100644 --- a/moderation/spam_detection/__init__.py +++ b/moderation/spam_detection/__init__.py @@ -1 +1,4 @@ from .cog import SpamDetectionCog + + +__all__ = ["SpamDetectionCog"] diff --git a/moderation/threads/__init__.py b/moderation/threads/__init__.py index df098bbed..68da0bec5 100644 --- a/moderation/threads/__init__.py +++ b/moderation/threads/__init__.py @@ -1 +1,4 @@ from .cog import ThreadsCog + + +__all__ = ["ThreadsCog"] diff --git a/moderation/user_notes/__init__.py b/moderation/user_notes/__init__.py index 09633bd04..1559a158d 100644 --- a/moderation/user_notes/__init__.py +++ b/moderation/user_notes/__init__.py @@ -1 +1,4 @@ from .cog import UserNoteCog + + +__all__ = ["UserNoteCog"] diff --git a/moderation/verification/__init__.py b/moderation/verification/__init__.py index 44c7b0d17..f0385aa71 100644 --- a/moderation/verification/__init__.py +++ b/moderation/verification/__init__.py @@ -1 +1,4 @@ from .cog import VerificationCog + + +__all__ = ["VerificationCog"]