mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-04-21 08:17:47 +00:00
Code Issues Projects Releases Wiki Activity

bot.unload_extension: also allow events with no module

Browse Source 
It turns out that events created in an eval command also cause
the issue described in #1506.

Ensure that events we remove are part of a module as well.

Also performs minor comment maintenance
("x", "first y", "then z") -> ("x", "y", "z")
This commit is contained in:
bmintz 2018-11-02 03:38:50 +00:00 committed by Rapptz
parent c3f99682de
commit 24c0946a93
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
discord/ext/commands/bot.py
View File

@ -734,20 +734,18 @@ class BotBase(GroupMixin):
if _is_submodule(lib_name, cog.__module__):
self.remove_cog(cogname)
# first remove all the commands from the module
# remove all the commands from the module
for cmd in self.all_commands.copy().values():
if cmd.module is None:
continue
if _is_submodule(lib_name, cmd.module):
if cmd.module is not None and _is_submodule(lib_name, cmd.module):
if isinstance(cmd, GroupMixin):
cmd.recursively_remove_all_commands()
self.remove_command(cmd.name)
# then remove all the listeners from the module
# remove all the listeners from the module
for event_list in self.extra_events.copy().values():
remove = []
for index, event in enumerate(event_list):
if _is_submodule(lib_name, event.__module__):
if event.__module__ is not None and _is_submodule(lib_name, event.__module__):
remove.append(index)
for index in reversed(remove):