Reorganize imports

Author: Taaku18

cogs/modmail.py

@@ -3,8 +3,9 @@
 from typing import Optional, Union
 
 import discord
-from dateutil import parser
 from discord.ext import commands
+
+from dateutil import parser
 from natural.date import duration
 
 from core import checks
@@ -615,7 +616,7 @@ async def contact(self, ctx,
             embed = discord.Embed(
                 color=discord.Color.red(),
                 description='A thread for this user already '
-                f'exists in {exists.channel.mention}.'
+                            f'exists in {exists.channel.mention}.'
             )
 
         else:

cogs/plugins.py

@@ -6,9 +6,10 @@
 import subprocess
 import sys
 
-from colorama import Fore, Style
 from discord.ext import commands
 
+from colorama import Fore, Style
+
 from core.models import Bot
 
 

cogs/utility.py

@@ -8,11 +8,12 @@
 from textwrap import indent
 
 import discord
-from aiohttp import ClientResponseError
 from discord import Embed, Color, Activity
 from discord.enums import ActivityType
 from discord.ext import commands
 
+from aiohttp import ClientResponseError
+
 from core import checks
 from core.changelog import Changelog
 from core.decorators import github_access_token_required, trigger_typing
@@ -27,13 +28,15 @@ class Utility:
     def __init__(self, bot: Bot):
         self.bot = bot
 
-    async def check_checks(self, ctx, cmd):
+    @staticmethod
+    async def verify_checks(ctx, cmd):
         predicates = cmd.checks
         if not predicates:
             return True
 
         try:
-            return await discord.utils.async_all(predicate(ctx) for predicate in predicates)
+            return await discord.utils.async_all(predicate(ctx)
+                                                 for predicate in predicates)
         except commands.CheckFailure:
             return False
 
@@ -45,7 +48,8 @@ async def format_cog_help(self, ctx, cog):
         fmts = ['']
         for cmd in sorted(self.bot.commands,
                           key=lambda cmd: cmd.qualified_name):
-            if cmd.instance is cog and not cmd.hidden and await self.check_checks(ctx, cmd):
+            if cmd.instance is cog and not cmd.hidden and \
+                    await self.verify_checks(ctx, cmd):
                 new_fmt = f'`{prefix + cmd.qualified_name}` - '
                 new_fmt += f'{cmd.short_doc}\n'
                 if len(new_fmt) + len(fmts[-1]) >= 1024:
@@ -58,7 +62,8 @@ async def format_cog_help(self, ctx, cog):
             if fmt == '':
                 continue
             embed = Embed(
-                description='*' + (inspect.getdoc(cog) or 'No description') + '*',
+                description='*' + (inspect.getdoc(cog) or
+                                   'No description') + '*',
                 color=self.bot.main_color
             )
 
@@ -73,7 +78,7 @@ async def format_cog_help(self, ctx, cog):
 
     async def format_command_help(self, ctx, cmd):
         """Formats command help."""
-        if cmd.hidden or not await self.check_checks(ctx, cmd):
+        if cmd.hidden or not await self.verify_checks(ctx, cmd):
             return None
 
         prefix = self.bot.prefix
@@ -117,13 +122,14 @@ async def format_not_found(self, ctx, command):
         # filter out hidden commands & blank cogs
         for i in self.bot.cogs:
             for cmd in self.bot.commands:
-                if cmd.cog_name == i and not cmd.hidden and await self.check_checks(ctx, cmd):
+                if cmd.cog_name == i and not cmd.hidden and \
+                        await self.verify_checks(ctx, cmd):
                     # as long as there's one valid cmd, add cog
                     choices.add(i)
                     break
 
         for i in self.bot.commands:
-            if not i.hidden and await self.check_checks(ctx, i):
+            if not i.hidden and await self.verify_checks(ctx, i):
                 choices.add(i.name)
 
         closest = get_close_matches(command, choices, n=1, cutoff=0.45)

core/clients.py

@@ -3,10 +3,11 @@
 from json import JSONDecodeError
 from typing import Union, Optional
 
-from aiohttp import ClientResponseError, ClientResponse
 from discord import Member, DMChannel
 from discord.ext import commands
 
+from aiohttp import ClientResponseError, ClientResponse
+
 from core.models import Bot, UserClient
 
 

core/models.py

@@ -3,10 +3,11 @@
 import typing
 from datetime import datetime
 
-from aiohttp import ClientSession
 from discord import Color, Member, User, CategoryChannel, DMChannel, Embed
 from discord import Message, TextChannel, Guild
 from discord.ext import commands
+
+from aiohttp import ClientSession
 from motor.motor_asyncio import AsyncIOMotorClient
 
 

core/time.py

@@ -6,9 +6,10 @@
 import re
 from datetime import datetime
 
+from discord.ext.commands import BadArgument, Converter
+
 import parsedatetime as pdt
 from dateutil.relativedelta import relativedelta
-from discord.ext.commands import BadArgument, Converter
 
 
 class ShortTime:

core/utils.py

@@ -5,13 +5,16 @@
 from discord import Object
 from discord.ext import commands
 
+
 class SafeDict(dict):
     def __missing__(self, key):
         return '{' + key + '}'
-        
-def safeformat(str, **kwargs):
+
+
+def safeformat(s, **kwargs):
     replacements = SafeDict(**kwargs)
-    return str.format_map(replacements)
+    return s.format_map(replacements)
+
 
 class User(commands.IDConverter):
     """