Skip to content

fix: 🚑 Fix circular import - oops #2704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 1, 2025
Merged

fix: 🚑 Fix circular import - oops #2704

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee91c07
:ambulance: Fix circular import - oops
Paillat-dev Feb 1, 2025
7501254
fix: NameError
Dorukyum Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions discord/ext/commands/help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
from typing import TYPE_CHECKING, Any

import discord.utils
from discord.ext import bridge

from .core import Command, Group
from .errors import CommandError
Expand Down Expand Up @@ -1111,13 +1110,15 @@ async def send_group_help(self, group):
await self.send_pages()

async def send_cog_help(self, cog):
from discord.ext.bridge import BridgeExtCommand

if cog.description:
self.paginator.add_line(cog.description, empty=True)

filtered = await self.filter_commands(
cog.get_commands(),
sort=self.sort_commands,
exclude=(bridge.BridgeExtCommand,),
exclude=(BridgeExtCommand,),
)
self.add_indented_commands(filtered, heading=self.commands_heading)

Expand Down Expand Up @@ -1355,6 +1356,8 @@ def get_category(command, *, no_category=no_category):
await self.send_pages()

async def send_cog_help(self, cog):
from discord.ext.bridge import BridgeExtCommand

bot = self.context.bot
if bot.description:
self.paginator.add_line(bot.description, empty=True)
Expand All @@ -1369,7 +1372,7 @@ async def send_cog_help(self, cog):
filtered = await self.filter_commands(
cog.get_commands(),
sort=self.sort_commands,
exclude=(bridge.BridgeExtCommand,),
exclude=(BridgeExtCommand,),
)
if filtered:
self.paginator.add_line(f"**{cog.qualified_name} {self.commands_heading}**")
Expand Down