diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ab0e6556f8..b92d7d4e32 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
   #          - --remove-duplicate-keys
   #          - --remove-unused-variables
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.17.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
@@ -28,7 +28,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
         args: [--safe, --quiet]
diff --git a/discord/audit_logs.py b/discord/audit_logs.py
index 5031942e95..7497e8c37a 100644
--- a/discord/audit_logs.py
+++ b/discord/audit_logs.py
@@ -213,7 +213,7 @@ class AuditLogDiff:
     def __len__(self) -> int:
         return len(self.__dict__)
 
-    def __iter__(self) -> Generator[tuple[str, Any], None, None]:
+    def __iter__(self) -> Generator[tuple[str, Any]]:
         yield from self.__dict__.items()
 
     def __repr__(self) -> str:
diff --git a/discord/bot.py b/discord/bot.py
index a81825b494..6ecc921f5c 100644
--- a/discord/bot.py
+++ b/discord/bot.py
@@ -1051,7 +1051,7 @@ def inner(cls: type[SlashCommandGroup]) -> SlashCommandGroup:
 
     slash_group = group
 
-    def walk_application_commands(self) -> Generator[ApplicationCommand, None, None]:
+    def walk_application_commands(self) -> Generator[ApplicationCommand]:
         """An iterator that recursively walks through all application commands and subcommands.
 
         Yields
diff --git a/discord/client.py b/discord/client.py
index 1fc004f35b..7f13696f6f 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -1041,7 +1041,7 @@ def get_poll(self, id: int, /) -> Poll | None:
         """
         return self._connection.get_poll(id)
 
-    def get_all_channels(self) -> Generator[GuildChannel, None, None]:
+    def get_all_channels(self) -> Generator[GuildChannel]:
         """A generator that retrieves every :class:`.abc.GuildChannel` the client can 'access'.
 
         This is equivalent to: ::
@@ -1065,7 +1065,7 @@ def get_all_channels(self) -> Generator[GuildChannel, None, None]:
         for guild in self.guilds:
             yield from guild.channels
 
-    def get_all_members(self) -> Generator[Member, None, None]:
+    def get_all_members(self) -> Generator[Member]:
         """Returns a generator with every :class:`.Member` the client can see.
 
         This is equivalent to: ::
diff --git a/discord/cog.py b/discord/cog.py
index 4f064edb26..e23def38e2 100644
--- a/discord/cog.py
+++ b/discord/cog.py
@@ -346,7 +346,7 @@ def description(self) -> str:
     def description(self, description: str) -> None:
         self.__cog_description__ = description
 
-    def walk_commands(self) -> Generator[ApplicationCommand, None, None]:
+    def walk_commands(self) -> Generator[ApplicationCommand]:
         """An iterator that recursively walks through this cog's commands and subcommands.
 
         Yields
diff --git a/discord/commands/core.py b/discord/commands/core.py
index c1093351d9..9212e76bed 100644
--- a/discord/commands/core.py
+++ b/discord/commands/core.py
@@ -1513,7 +1513,7 @@ async def call_after_hooks(self, ctx: ApplicationContext) -> None:
             else:
                 await self._after_invoke(ctx)  # type: ignore
 
-    def walk_commands(self) -> Generator[SlashCommand | SlashCommandGroup, None, None]:
+    def walk_commands(self) -> Generator[SlashCommand | SlashCommandGroup]:
         """An iterator that recursively walks through all slash commands and groups in this group.
 
         Yields
diff --git a/discord/ext/commands/cog.py b/discord/ext/commands/cog.py
index 570609d9a2..871d3e816e 100644
--- a/discord/ext/commands/cog.py
+++ b/discord/ext/commands/cog.py
@@ -50,7 +50,7 @@ def __new__(cls: type[CogT], *args: Any, **kwargs: Any) -> CogT:
         # To do this, we need to interfere with the Cog creation process.
         return super().__new__(cls)
 
-    def walk_commands(self) -> Generator[Command, None, None]:
+    def walk_commands(self) -> Generator[Command]:
         """An iterator that recursively walks through this cog's commands and subcommands.
 
         Yields
diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py
index 1f876f175d..992ba05956 100644
--- a/discord/ext/commands/core.py
+++ b/discord/ext/commands/core.py
@@ -1326,7 +1326,7 @@ def remove_command(self, name: str) -> Command[CogT, Any, Any] | None:
                 self.prefixed_commands[alias] = cmd
         return command
 
-    def walk_commands(self) -> Generator[Command[CogT, Any, Any], None, None]:
+    def walk_commands(self) -> Generator[Command[CogT, Any, Any]]:
         """An iterator that recursively walks through all commands and subcommands.
 
         .. versionchanged:: 1.4
diff --git a/discord/oggparse.py b/discord/oggparse.py
index 9cc0025bf1..4901c38b77 100644
--- a/discord/oggparse.py
+++ b/discord/oggparse.py
@@ -74,7 +74,7 @@ def __init__(self, stream: IO[bytes]) -> None:
         except Exception:
             raise OggError("bad data stream") from None
 
-    def iter_packets(self) -> Generator[tuple[bytes, bool], None, None]:
+    def iter_packets(self) -> Generator[tuple[bytes, bool]]:
         packetlen = offset = 0
         partial = True
 
@@ -106,13 +106,13 @@ def _next_page(self) -> OggPage | None:
         else:
             raise OggError("invalid header magic")
 
-    def _iter_pages(self) -> Generator[OggPage, None, None]:
+    def _iter_pages(self) -> Generator[OggPage]:
         page = self._next_page()
         while page:
             yield page
             page = self._next_page()
 
-    def iter_packets(self) -> Generator[bytes, None, None]:
+    def iter_packets(self) -> Generator[bytes]:
         partial = b""
         for page in self._iter_pages():
             for data, complete in page.iter_packets():