chore: Apply more suggested changes

4 files changed, 17 insertions, 18 deletions

diff --git a/bot/exts/easter/bunny_name_generator.py b/bot/exts/easter/bunny_name_generator.py
index 19a0b0f6..b6523ff6 100644
--- a/bot/exts/easter/bunny_name_generator.py
+++ b/bot/exts/easter/bunny_name_generator.py
@@ -23,6 +23,7 @@ class BunnyNameGenerator(commands.Cog):
         new_name = re.split(r"[_.\s]", displayname)
         if displayname not in new_name:
             return new_name
+        return None
 
     def find_vowels(self, displayname: str) -> str:
         """
diff --git a/bot/exts/evergreen/help.py b/bot/exts/evergreen/help.py
index bfaf25f1..7e3fdad4 100644
--- a/bot/exts/evergreen/help.py
+++ b/bot/exts/evergreen/help.py
@@ -2,9 +2,8 @@
 import asyncio
 import itertools
 import logging
-from collections import namedtuple
 from contextlib import suppress
-from typing import Union
+from typing import List, NamedTuple, Union
 
 from discord import Colour, Embed, HTTPException, Message, Reaction, User
 from discord.ext import commands
@@ -29,7 +28,14 @@ REACTIONS = {
     DELETE_EMOJI: "stop",
 }
 
-Cog = namedtuple("Cog", ["name", "description", "commands"])
+
+class Cog(NamedTuple):
+    """Show information about a Cog's name, description and commands."""
+
+    name: str
+    description: str
+    commands: List[Command]
+
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/exts/evergreen/snakes/_utils.py b/bot/exts/evergreen/snakes/_utils.py
index 998c13a9..9b38ffa2 100644
--- a/bot/exts/evergreen/snakes/_utils.py
+++ b/bot/exts/evergreen/snakes/_utils.py
@@ -192,9 +192,7 @@ class PerlinNoiseFactory(object):
         """Get plain noise for a single point, without taking into account either octaves or tiling."""
         if len(point) != self.dimension:
             raise ValueError(
-                "Expected {0} values, got {1}".format(
-                    self.dimension, len(point)
-                )
+                f"Expected {self.dimension} values, got {len(point)}"
             )
 
         # Build a list of the (min, max) bounds in each dimension
diff --git a/bot/exts/valentines/be_my_valentine.py b/bot/exts/valentines/be_my_valentine.py
index b9cf6738..d1eea388 100644
--- a/bot/exts/valentines/be_my_valentine.py
+++ b/bot/exts/valentines/be_my_valentine.py
@@ -151,21 +151,17 @@ class BeMyValentine(commands.Cog):
     def valentine_check(self, valentine_type: str) -> Tuple[str, str]:
         """Return the appropriate Valentine type & title based on the invoking user's input."""
         if valentine_type is None:
-            valentine, title = self.random_valentine()
+            return self.random_valentine()
 
         elif valentine_type.lower() in ["p", "poem"]:
-            valentine = self.valentine_poem()
-            title = "A poem dedicated to"
+            return self.valentine_poem(), "A poem dedicated to"
 
         elif valentine_type.lower() in ["c", "compliment"]:
-            valentine = self.valentine_compliment()
-            title = "A compliment for"
+            return self.valentine_compliment(), "A compliment for"
 
         else:
             # in this case, the user decides to type his own valentine.
-            valentine = valentine_type
-            title = "A message for"
-        return valentine, title
+            return valentine_type, "A message for"
 
     @staticmethod
     def random_emoji() -> Tuple[str, str]:
@@ -187,13 +183,11 @@ class BeMyValentine(commands.Cog):
 
     def valentine_poem(self) -> str:
         """Grabs a random poem."""
-        valentine_poem = random.choice(self.valentines["valentine_poems"])
-        return valentine_poem
+        return random.choice(self.valentines["valentine_poems"])
 
     def valentine_compliment(self) -> str:
         """Grabs a random compliment."""
-        valentine_compliment = random.choice(self.valentines["valentine_compliments"])
-        return valentine_compliment
+        return random.choice(self.valentines["valentine_compliments"])
 
 
 def setup(bot: Bot) -> None: