From 584ca311647220671b6d7c5adc2e5bd359f41876 Mon Sep 17 00:00:00 2001 From: "flare (Jamie)" Date: Sat, 16 Jan 2021 01:39:32 +0000 Subject: [PATCH] style fix --- antispam/antispam.py | 1 + botlistspost/botlistspost.py | 1 + commandstats/commandstats.py | 1 + commandstats/menus.py | 1 + covid/covid.py | 1 + covid/menus.py | 1 + dankmemer/dankmemer.py | 1 + dminvites/dminvites.py | 1 + embedcreator/embedcreator.py | 1 + embedcreator/globalembeds.py | 1 + embedcreator/sending.py | 1 + embedcreator/storing.py | 1 + embedcreator/update.py | 3 +-- embedcreator/utils.py | 3 ++- faceit/faceit.py | 1 + faceit/funcs.py | 1 + forward/forward.py | 1 + joinmessage/joinmessage.py | 1 + make.bat | 6 +++--- mod/mod.py | 1 + news/menus.py | 1 + news/news.py | 1 + r6/r6.py | 1 + r6/stats.py | 1 + redditpost/redditpost.py | 1 + serverlock/serverlock.py | 1 + simleague/core.py | 1 + simleague/simleague.py | 1 + simleague/simset.py | 1 + simleague/stats.py | 1 + simleague/teamset.py | 1 + snipe/snipe.py | 1 + stickbugged/stickbugged.py | 1 + tips/tips.py | 1 + unbelievaboat/checks.py | 1 + unbelievaboat/roulette.py | 1 + unbelievaboat/settings.py | 1 + unbelievaboat/unbelievaboat.py | 1 + unbelievaboat/wallet.py | 1 + userinfo/userinfo.py | 1 + 40 files changed, 43 insertions(+), 6 deletions(-) diff --git a/antispam/antispam.py b/antispam/antispam.py index d6c65683..14e0b4ff 100644 --- a/antispam/antispam.py +++ b/antispam/antispam.py @@ -4,6 +4,7 @@ from typing import Optional import discord + from redbot.core import Config, commands from redbot.core.commands.converter import TimedeltaConverter from redbot.core.utils.chat_formatting import humanize_timedelta, pagify diff --git a/botlistspost/botlistspost.py b/botlistspost/botlistspost.py index 12ffea43..ecdab0d7 100644 --- a/botlistspost/botlistspost.py +++ b/botlistspost/botlistspost.py @@ -6,6 +6,7 @@ import aiohttp import discord + from redbot.core import Config, commands from redbot.core.utils.chat_formatting import humanize_list, pagify from redbot.core.utils.menus import DEFAULT_CONTROLS, menu diff --git a/commandstats/commandstats.py b/commandstats/commandstats.py index 70a78f0f..c847e27c 100644 --- a/commandstats/commandstats.py +++ b/commandstats/commandstats.py @@ -7,6 +7,7 @@ from typing import Counter, Optional import discord + import pandas from redbot.core import Config, commands diff --git a/commandstats/menus.py b/commandstats/menus.py index 24e2db98..27e818df 100644 --- a/commandstats/menus.py +++ b/commandstats/menus.py @@ -3,6 +3,7 @@ from typing import Any, Dict, Iterable, Optional import discord + import tabulate from redbot.core import commands from redbot.core.utils.chat_formatting import box, escape, humanize_number diff --git a/covid/covid.py b/covid/covid.py index 8971fcd6..0702d2e6 100644 --- a/covid/covid.py +++ b/covid/covid.py @@ -3,6 +3,7 @@ import aiohttp import discord + from redbot.core import commands from redbot.core.utils.chat_formatting import humanize_number diff --git a/covid/menus.py b/covid/menus.py index e25bb811..ae4ff25b 100644 --- a/covid/menus.py +++ b/covid/menus.py @@ -3,6 +3,7 @@ from typing import Any, Dict, Iterable, Optional import discord + import validators from redbot.core import commands from redbot.core.utils.chat_formatting import humanize_number diff --git a/dankmemer/dankmemer.py b/dankmemer/dankmemer.py index 7e0543d0..49b7c64d 100644 --- a/dankmemer/dankmemer.py +++ b/dankmemer/dankmemer.py @@ -6,6 +6,7 @@ import aiohttp import discord + import validators from redbot.core import Config, commands from redbot.core.utils.predicates import MessagePredicate diff --git a/dminvites/dminvites.py b/dminvites/dminvites.py index 28d96dab..4336f870 100644 --- a/dminvites/dminvites.py +++ b/dminvites/dminvites.py @@ -1,4 +1,5 @@ import discord + from redbot.core import Config, commands from redbot.core.utils.common_filters import INVITE_URL_RE diff --git a/embedcreator/embedcreator.py b/embedcreator/embedcreator.py index 979c4bf6..1f470560 100644 --- a/embedcreator/embedcreator.py +++ b/embedcreator/embedcreator.py @@ -5,6 +5,7 @@ from typing import Optional import discord + from redbot.core import Config, commands from .embedmixin import EmbedMixin diff --git a/embedcreator/globalembeds.py b/embedcreator/globalembeds.py index e21d5e6a..62a13b0c 100644 --- a/embedcreator/globalembeds.py +++ b/embedcreator/globalembeds.py @@ -2,6 +2,7 @@ from typing import Optional import discord + from redbot.core import commands from redbot.core.utils.chat_formatting import humanize_list, pagify from redbot.core.utils.menus import DEFAULT_CONTROLS, menu diff --git a/embedcreator/sending.py b/embedcreator/sending.py index 494a4c21..f3fa57d5 100644 --- a/embedcreator/sending.py +++ b/embedcreator/sending.py @@ -3,6 +3,7 @@ from typing import Optional import discord + from redbot.core import commands from .abc import MixinMeta diff --git a/embedcreator/storing.py b/embedcreator/storing.py index 93c46d0c..f8c2f70d 100644 --- a/embedcreator/storing.py +++ b/embedcreator/storing.py @@ -2,6 +2,7 @@ from typing import Optional import discord + from redbot.core import commands from .abc import MixinMeta diff --git a/embedcreator/update.py b/embedcreator/update.py index 10aeb98d..f02661f5 100644 --- a/embedcreator/update.py +++ b/embedcreator/update.py @@ -2,9 +2,8 @@ from typing import Optional import discord + from redbot.core import commands -from redbot.core.utils.chat_formatting import humanize_list, pagify -from redbot.core.utils.menus import DEFAULT_CONTROLS, menu from .abc import MixinMeta from .embedmixin import embed diff --git a/embedcreator/utils.py b/embedcreator/utils.py index d18505d2..94a1ee1b 100644 --- a/embedcreator/utils.py +++ b/embedcreator/utils.py @@ -1,9 +1,10 @@ import json import traceback -from typing import Optional from io import StringIO +from typing import Optional import discord + from redbot.core import commands from redbot.core.utils.chat_formatting import humanize_list, pagify from redbot.core.utils.menus import DEFAULT_CONTROLS, menu diff --git a/faceit/faceit.py b/faceit/faceit.py index e3171934..c43e88b6 100644 --- a/faceit/faceit.py +++ b/faceit/faceit.py @@ -4,6 +4,7 @@ import aiohttp import discord + from redbot.core import Config, commands from redbot.core.utils.chat_formatting import humanize_timedelta from redbot.core.utils.menus import DEFAULT_CONTROLS, close_menu, menu, next_page, prev_page diff --git a/faceit/funcs.py b/faceit/funcs.py index 886c62ba..16c87e4a 100644 --- a/faceit/funcs.py +++ b/faceit/funcs.py @@ -1,6 +1,7 @@ import contextlib import discord + from redbot.core import commands from redbot.core.utils.menus import menu diff --git a/forward/forward.py b/forward/forward.py index 2e66bcf1..3d17284e 100644 --- a/forward/forward.py +++ b/forward/forward.py @@ -1,4 +1,5 @@ import discord + from redbot.core import Config, checks, commands from redbot.core.utils.chat_formatting import humanize_list diff --git a/joinmessage/joinmessage.py b/joinmessage/joinmessage.py index 3a9a3bbf..32ad6e18 100644 --- a/joinmessage/joinmessage.py +++ b/joinmessage/joinmessage.py @@ -1,6 +1,7 @@ import logging import discord + from redbot.core import Config, commands log = logging.getLogger("red.flare.joinmessage") diff --git a/make.bat b/make.bat index f5825463..fdbb2de9 100644 --- a/make.bat +++ b/make.bat @@ -22,9 +22,9 @@ if [!DIFF!]==[] ( goto %1 :reformat -py -m autoflake --in-place --imports=aiohttp,discord,redbot !DIFF! || goto :eof -py -m isort !DIFF! || goto :eof -py -m black !DIFF! +autoflake --in-place --imports=aiohttp,discord,redbot !DIFF! || goto :eof +isort !DIFF! || goto :eof +black !DIFF! goto :eof :stylecheck diff --git a/mod/mod.py b/mod/mod.py index bdb81ede..0a902b9d 100644 --- a/mod/mod.py +++ b/mod/mod.py @@ -4,6 +4,7 @@ from typing import Literal, Optional import discord + from redbot.cogs.mod import Mod as ModClass from redbot.core import Config, checks, commands, modlog from redbot.core.commands.converter import TimedeltaConverter diff --git a/news/menus.py b/news/menus.py index d2fdd252..fd12a646 100644 --- a/news/menus.py +++ b/news/menus.py @@ -2,6 +2,7 @@ from typing import Any, Dict, Iterable, Optional import discord + import iso8601 import validators from redbot.core import commands diff --git a/news/news.py b/news/news.py index b2c28ce7..1eafc06f 100644 --- a/news/news.py +++ b/news/news.py @@ -1,4 +1,5 @@ import aiohttp + from redbot.core import commands from .menus import ArticleFormat, GenericMenu diff --git a/r6/r6.py b/r6/r6.py index 07e2f26b..3c6e8fff 100644 --- a/r6/r6.py +++ b/r6/r6.py @@ -2,6 +2,7 @@ from io import BytesIO import discord + import r6statsapi from redbot.core import Config, checks, commands from redbot.core.utils.chat_formatting import humanize_timedelta diff --git a/r6/stats.py b/r6/stats.py index b4b329c5..4d125a04 100644 --- a/r6/stats.py +++ b/r6/stats.py @@ -3,6 +3,7 @@ import aiohttp import discord + import r6statsapi from PIL import Image, ImageDraw, ImageFont from redbot.core.data_manager import bundled_data_path diff --git a/redditpost/redditpost.py b/redditpost/redditpost.py index 7f60a6b2..6e6d4dee 100644 --- a/redditpost/redditpost.py +++ b/redditpost/redditpost.py @@ -7,6 +7,7 @@ import aiohttp import discord + import tabulate import validators from redbot.core import Config, commands diff --git a/serverlock/serverlock.py b/serverlock/serverlock.py index dbdbe9e0..0208aa61 100644 --- a/serverlock/serverlock.py +++ b/serverlock/serverlock.py @@ -1,4 +1,5 @@ import discord + import jsonpickle from redbot.core import Config, commands diff --git a/simleague/core.py b/simleague/core.py index 237e84a8..29ec9126 100644 --- a/simleague/core.py +++ b/simleague/core.py @@ -4,6 +4,7 @@ import aiohttp import discord + from motor.motor_asyncio import AsyncIOMotorClient from PIL import Image, ImageDraw, ImageFont, ImageOps from redbot.core.data_manager import bundled_data_path diff --git a/simleague/simleague.py b/simleague/simleague.py index 7e7fef61..f3238e9a 100644 --- a/simleague/simleague.py +++ b/simleague/simleague.py @@ -7,6 +7,7 @@ import aiohttp import discord + from redbot.core import Config, bank, checks, commands from redbot.core.utils.chat_formatting import box from redbot.core.utils.menus import DEFAULT_CONTROLS, menu diff --git a/simleague/simset.py b/simleague/simset.py index fe2de2e2..f304f750 100644 --- a/simleague/simset.py +++ b/simleague/simset.py @@ -1,4 +1,5 @@ import discord + from redbot.core import checks, commands from redbot.core.utils.chat_formatting import box diff --git a/simleague/stats.py b/simleague/stats.py index be46ef1e..27c22378 100644 --- a/simleague/stats.py +++ b/simleague/stats.py @@ -1,4 +1,5 @@ import discord + from redbot.core import commands from .abc import MixinMeta diff --git a/simleague/teamset.py b/simleague/teamset.py index 31333676..eb08b128 100644 --- a/simleague/teamset.py +++ b/simleague/teamset.py @@ -1,4 +1,5 @@ import discord + import validators from redbot.core import checks, commands diff --git a/snipe/snipe.py b/snipe/snipe.py index 801a93da..0c5ffcf8 100644 --- a/snipe/snipe.py +++ b/snipe/snipe.py @@ -4,6 +4,7 @@ from typing import Optional import discord + from redbot.core import Config, checks, commands from redbot.core.commands.converter import TimedeltaConverter diff --git a/stickbugged/stickbugged.py b/stickbugged/stickbugged.py index 523acfb8..fd69274b 100644 --- a/stickbugged/stickbugged.py +++ b/stickbugged/stickbugged.py @@ -7,6 +7,7 @@ import aiohttp import discord + from gsbl.stick_bug import StickBug from PIL import Image from redbot.core import commands diff --git a/tips/tips.py b/tips/tips.py index f4feed45..978472d1 100644 --- a/tips/tips.py +++ b/tips/tips.py @@ -2,6 +2,7 @@ import random import discord + from redbot.core import commands from redbot.core.config import Config from redbot.core.utils.menus import DEFAULT_CONTROLS, menu diff --git a/unbelievaboat/checks.py b/unbelievaboat/checks.py index 1d7d3f35..63ae60d5 100644 --- a/unbelievaboat/checks.py +++ b/unbelievaboat/checks.py @@ -1,4 +1,5 @@ import discord + from redbot.core import bank, commands diff --git a/unbelievaboat/roulette.py b/unbelievaboat/roulette.py index 11aea144..6727f261 100644 --- a/unbelievaboat/roulette.py +++ b/unbelievaboat/roulette.py @@ -3,6 +3,7 @@ import random import discord + import tabulate from redbot.core import bank, checks, commands from redbot.core.errors import BalanceTooHigh diff --git a/unbelievaboat/settings.py b/unbelievaboat/settings.py index c3951e1d..3e5f33fe 100644 --- a/unbelievaboat/settings.py +++ b/unbelievaboat/settings.py @@ -1,6 +1,7 @@ import datetime import discord + from redbot.core import commands from redbot.core.utils.chat_formatting import humanize_number, humanize_timedelta from redbot.core.utils.menus import DEFAULT_CONTROLS, menu diff --git a/unbelievaboat/unbelievaboat.py b/unbelievaboat/unbelievaboat.py index 6a5e43e7..c4d614f4 100644 --- a/unbelievaboat/unbelievaboat.py +++ b/unbelievaboat/unbelievaboat.py @@ -5,6 +5,7 @@ from typing import Literal, Optional import discord + import tabulate from redbot.core import Config, bank, checks, commands from redbot.core.errors import BalanceTooHigh diff --git a/unbelievaboat/wallet.py b/unbelievaboat/wallet.py index 2156ff2d..499c3944 100644 --- a/unbelievaboat/wallet.py +++ b/unbelievaboat/wallet.py @@ -1,6 +1,7 @@ from typing import Union import discord + from redbot.core import bank, commands from redbot.core.errors import BalanceTooHigh from redbot.core.utils.chat_formatting import box, humanize_number diff --git a/userinfo/userinfo.py b/userinfo/userinfo.py index 90acdeb3..a936eddb 100644 --- a/userinfo/userinfo.py +++ b/userinfo/userinfo.py @@ -1,6 +1,7 @@ import logging import discord + from redbot.core import bank, commands from redbot.core.utils import AsyncIter from redbot.core.utils.chat_formatting import humanize_number