Merge pull request #368 from python-discord/feat/deps/355/pep8-naming

Add pep8-naming and more pre-commit hooks

5 files changed, 78 insertions, 78 deletions

diff --git a/bot/seasons/christmas/adventofcode.py b/bot/seasons/christmas/adventofcode.py
index f2ec83df..8caf43bd 100644
--- a/bot/seasons/christmas/adventofcode.py
+++ b/bot/seasons/christmas/adventofcode.py
@@ -364,7 +364,7 @@ class AdventOfCode(commands.Cog):
             aoc_embed.set_footer(text="Last Updated")
 
         await ctx.send(
-            content=f"Here's the current global Top {number_of_people_to_display}! {Emojis.christmas_tree*3}\n\n{table}",  # noqa
+            f"Here's the current global Top {number_of_people_to_display}! {Emojis.christmas_tree*3}\n\n{table}",
             embed=aoc_embed,
         )
 
diff --git a/bot/seasons/evergreen/bookmark.py b/bot/seasons/evergreen/bookmark.py
index 7bdd362c..bd7d5c11 100644
--- a/bot/seasons/evergreen/bookmark.py
+++ b/bot/seasons/evergreen/bookmark.py
@@ -1,65 +1,65 @@
-import logging

-import random

-

-import discord

-from discord.ext import commands

-

-from bot.constants import Colours, ERROR_REPLIES, Emojis, bookmark_icon_url

-

-log = logging.getLogger(__name__)

-

-

-class Bookmark(commands.Cog):

-    """Creates personal bookmarks by relaying a message link to the user's DMs."""

-

-    def __init__(self, bot: commands.Bot):

-        self.bot = bot

-

-    @commands.command(name="bookmark", aliases=("bm", "pin"))

-    async def bookmark(

-        self,

-        ctx: commands.Context,

-        target_message: discord.Message,

-        *,

-        title: str = "Bookmark"

-    ) -> None:

-        """Send the author a link to `target_message` via DMs."""

-        # Prevent users from bookmarking a message in a channel they don't have access to

-        permissions = ctx.author.permissions_in(target_message.channel)

-        if not permissions.read_messages:

-            log.info(f"{ctx.author} tried to bookmark a message in #{target_message.channel} but has no permissions")

-            embed = discord.Embed(

-                title=random.choice(ERROR_REPLIES),

-                color=Colours.soft_red,

-                description="You don't have permission to view this channel."

-            )

-            await ctx.send(embed=embed)

-            return

-

-        embed = discord.Embed(

-            title=title,

-            colour=Colours.soft_green,

-            description=target_message.content

-        )

-        embed.add_field(name="Wanna give it a visit?", value=f"[Visit original message]({target_message.jump_url})")

-        embed.set_author(name=target_message.author, icon_url=target_message.author.avatar_url)

-        embed.set_thumbnail(url=bookmark_icon_url)

-

-        try:

-            await ctx.author.send(embed=embed)

-        except discord.Forbidden:

-            error_embed = discord.Embed(

-                title=random.choice(ERROR_REPLIES),

-                description=f"{ctx.author.mention}, please enable your DMs to receive the bookmark",

-                colour=Colours.soft_red

-            )

-            await ctx.send(embed=error_embed)

-        else:

-            log.info(f"{ctx.author} bookmarked {target_message.jump_url} with title '{title}'")

-            await ctx.message.add_reaction(Emojis.envelope)

-

-

-def setup(bot: commands.Bot) -> None:

-    """Load the Bookmark cog."""

-    bot.add_cog(Bookmark(bot))

-    log.info("Bookmark cog loaded")

+import logging
+import random
+
+import discord
+from discord.ext import commands
+
+from bot.constants import Colours, ERROR_REPLIES, Emojis, bookmark_icon_url
+
+log = logging.getLogger(__name__)
+
+
+class Bookmark(commands.Cog):
+    """Creates personal bookmarks by relaying a message link to the user's DMs."""
+
+    def __init__(self, bot: commands.Bot):
+        self.bot = bot
+
+    @commands.command(name="bookmark", aliases=("bm", "pin"))
+    async def bookmark(
+        self,
+        ctx: commands.Context,
+        target_message: discord.Message,
+        *,
+        title: str = "Bookmark"
+    ) -> None:
+        """Send the author a link to `target_message` via DMs."""
+        # Prevent users from bookmarking a message in a channel they don't have access to
+        permissions = ctx.author.permissions_in(target_message.channel)
+        if not permissions.read_messages:
+            log.info(f"{ctx.author} tried to bookmark a message in #{target_message.channel} but has no permissions")
+            embed = discord.Embed(
+                title=random.choice(ERROR_REPLIES),
+                color=Colours.soft_red,
+                description="You don't have permission to view this channel."
+            )
+            await ctx.send(embed=embed)
+            return
+
+        embed = discord.Embed(
+            title=title,
+            colour=Colours.soft_green,
+            description=target_message.content
+        )
+        embed.add_field(name="Wanna give it a visit?", value=f"[Visit original message]({target_message.jump_url})")
+        embed.set_author(name=target_message.author, icon_url=target_message.author.avatar_url)
+        embed.set_thumbnail(url=bookmark_icon_url)
+
+        try:
+            await ctx.author.send(embed=embed)
+        except discord.Forbidden:
+            error_embed = discord.Embed(
+                title=random.choice(ERROR_REPLIES),
+                description=f"{ctx.author.mention}, please enable your DMs to receive the bookmark",
+                colour=Colours.soft_red
+            )
+            await ctx.send(embed=error_embed)
+        else:
+            log.info(f"{ctx.author} bookmarked {target_message.jump_url} with title '{title}'")
+            await ctx.message.add_reaction(Emojis.envelope)
+
+
+def setup(bot: commands.Bot) -> None:
+    """Load the Bookmark cog."""
+    bot.add_cog(Bookmark(bot))
+    log.info("Bookmark cog loaded")
diff --git a/bot/seasons/evergreen/snakes/snakes_cog.py b/bot/seasons/evergreen/snakes/snakes_cog.py
index 1ed38f86..09f5e250 100644
--- a/bot/seasons/evergreen/snakes/snakes_cog.py
+++ b/bot/seasons/evergreen/snakes/snakes_cog.py
@@ -617,8 +617,8 @@ class Snakes(Cog):
                 text_color=text_color,
                 bg_color=bg_color
             )
-            png_bytesIO = utils.frame_to_png_bytes(image_frame)
-            file = File(png_bytesIO, filename='snek.png')
+            png_bytes = utils.frame_to_png_bytes(image_frame)
+            file = File(png_bytes, filename='snek.png')
             await ctx.send(file=file)
 
     @snakes_group.command(name='get')
diff --git a/bot/seasons/halloween/hacktoberstats.py b/bot/seasons/halloween/hacktoberstats.py
index b7b4122d..d61e048b 100644
--- a/bot/seasons/halloween/hacktoberstats.py
+++ b/bot/seasons/halloween/hacktoberstats.py
@@ -121,8 +121,8 @@ class HacktoberStats(commands.Cog):
         """
         if self.link_json.exists():
             logging.info(f"Loading linked GitHub accounts from '{self.link_json}'")
-            with open(self.link_json, 'r') as fID:
-                linked_accounts = json.load(fID)
+            with open(self.link_json, 'r') as file:
+                linked_accounts = json.load(file)
 
             logging.info(f"Loaded {len(linked_accounts)} linked GitHub accounts from '{self.link_json}'")
             return linked_accounts
@@ -143,8 +143,8 @@ class HacktoberStats(commands.Cog):
             }
         """
         logging.info(f"Saving linked_accounts to '{self.link_json}'")
-        with open(self.link_json, 'w') as fID:
-            json.dump(self.linked_accounts, fID, default=str)
+        with open(self.link_json, 'w') as file:
+            json.dump(self.linked_accounts, file, default=str)
         logging.info(f"linked_accounts saved to '{self.link_json}'")
 
     async def get_stats(self, ctx: commands.Context, github_username: str) -> None:
@@ -309,11 +309,11 @@ class HacktoberStats(commands.Cog):
            n contribution(s) to [shortname](url)
            ...
         """
-        baseURL = "https://www.github.com/"
+        base_url = "https://www.github.com/"
         contributionstrs = []
         for repo in stats['top5']:
             n = repo[1]
-            contributionstrs.append(f"{n} {HacktoberStats._contributionator(n)} to [{repo[0]}]({baseURL}{repo[0]})")
+            contributionstrs.append(f"{n} {HacktoberStats._contributionator(n)} to [{repo[0]}]({base_url}{repo[0]})")
 
         return "\n".join(contributionstrs)
 
@@ -334,7 +334,7 @@ class HacktoberStats(commands.Cog):
         return author_id, author_mention
 
 
-def setup(bot):  # Noqa
+def setup(bot: commands.Bot) -> None:
     """Hacktoberstats Cog load."""
     bot.add_cog(HacktoberStats(bot))
     log.info("HacktoberStats cog loaded")
diff --git a/bot/seasons/valentines/be_my_valentine.py b/bot/seasons/valentines/be_my_valentine.py
index de97cb4e..ab8ea290 100644
--- a/bot/seasons/valentines/be_my_valentine.py
+++ b/bot/seasons/valentines/be_my_valentine.py
@@ -202,9 +202,9 @@ class BeMyValentine(commands.Cog):
     @staticmethod
     def random_emoji() -> Tuple[str, str]:
         """Return two random emoji from the module-defined constants."""
-        EMOJI_1 = random.choice(HEART_EMOJIS)
-        EMOJI_2 = random.choice(HEART_EMOJIS)
-        return EMOJI_1, EMOJI_2
+        emoji_1 = random.choice(HEART_EMOJIS)
+        emoji_2 = random.choice(HEART_EMOJIS)
+        return emoji_1, emoji_2
 
     def random_valentine(self) -> Tuple[str, str]:
         """Grabs a random poem or a compliment (any message)."""