1 files changed, 19 insertions, 78 deletions

diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py
index 929e33cd..e0de7d4f 100644
--- a/discord/ext/commands/bot.py
+++ b/discord/ext/commands/bot.py
@@ -39,6 +39,7 @@ from .view import StringView
 from .context import Context
 from .errors import CommandNotFound, CommandError
 from .formatter import HelpFormatter
+from .cog import Cog
 
 def when_mentioned(bot, msg):
     """A callable that implements a command prefix equivalent to being mentioned.
@@ -181,7 +182,8 @@ class BotBase(GroupMixin):
             self.formatter = HelpFormatter()
 
         # pay no mind to this ugliness.
-        self.command(**self.help_attrs)(_default_help_command)
+        help_cmd = Command(_default_help_command, **self.help_attrs)
+        self.add_command(help_cmd)
 
     # internal helpers
 
@@ -524,49 +526,24 @@ class BotBase(GroupMixin):
 
         A cog is a class that has its own event listeners and commands.
 
-        They are meant as a way to organize multiple relevant commands
-        into a singular class that shares some state or no state at all.
-
-        The cog can also have a ``__global_check`` member function that allows
-        you to define a global check. See :meth:`.check` for more info. If
-        the name is ``__global_check_once`` then it's equivalent to the
-        :meth:`.check_once` decorator.
-
-        More information will be documented soon.
-
         Parameters
         -----------
         cog
             The cog to register to the bot.
-        """
-
-        self.cogs[type(cog).__name__] = cog
-
-        try:
-            check = getattr(cog, '_{.__class__.__name__}__global_check'.format(cog))
-        except AttributeError:
-            pass
-        else:
-            self.add_check(check)
 
-        try:
-            check = getattr(cog, '_{.__class__.__name__}__global_check_once'.format(cog))
-        except AttributeError:
-            pass
-        else:
-            self.add_check(check, call_once=True)
+        Raises
+        -------
+        TypeError
+            The cog does not inherit from :class:`.Cog`.
+        CommandError
+            An error happened during loading.
+        """
 
-        members = inspect.getmembers(cog)
-        for name, member in members:
-            # register commands the cog has
-            if isinstance(member, Command):
-                if member.parent is None:
-                    self.add_command(member)
-                continue
+        if not isinstance(cog, Cog):
+            raise TypeError('cogs must derive from Cog')
 
-            # register event listeners the cog has
-            if name.startswith('on_'):
-                self.add_listener(member, name)
+        cog = cog._inject(self)
+        self.cogs[cog.__cog_name__] = cog
 
     def get_cog(self, name):
         """Gets the cog instance requested.
@@ -577,6 +554,8 @@ class BotBase(GroupMixin):
         -----------
         name : str
             The name of the cog you are requesting.
+            This is equivalent to the name passed via keyword
+            argument in class creation or the class name if unspecified.
         """
         return self.cogs.get(name)
 
@@ -603,7 +582,7 @@ class BotBase(GroupMixin):
         except KeyError:
             return set()
 
-        return {c for c in self.all_commands.values() if c.instance is cog}
+        return {c for c in self.all_commands.values() if c.cog is cog}
 
     def remove_cog(self, name):
         """Removes a cog from the bot.
@@ -613,13 +592,9 @@ class BotBase(GroupMixin):
 
         If no cog is found then this method has no effect.
 
-        If the cog defines a special member function named ``__unload``
-        then it is called when removal has completed. This function
-        **cannot** be a coroutine. It must be a regular function.
-
         Parameters
         -----------
-        name : str
+        name: :class:`str`
             The name of the cog to remove.
         """
 
@@ -627,41 +602,7 @@ class BotBase(GroupMixin):
         if cog is None:
             return
 
-        members = inspect.getmembers(cog)
-        for name, member in members:
-            # remove commands the cog has
-            if isinstance(member, Command):
-                if member.parent is None:
-                    self.remove_command(member.name)
-                continue
-
-            # remove event listeners the cog has
-            if name.startswith('on_'):
-                self.remove_listener(member)
-
-        try:
-            check = getattr(cog, '_{0.__class__.__name__}__global_check'.format(cog))
-        except AttributeError:
-            pass
-        else:
-            self.remove_check(check)
-
-        try:
-            check = getattr(cog, '_{0.__class__.__name__}__global_check_once'.format(cog))
-        except AttributeError:
-            pass
-        else:
-            self.remove_check(check, call_once=True)
-
-        unloader_name = '_{0.__class__.__name__}__unload'.format(cog)
-        try:
-            unloader = getattr(cog, unloader_name)
-        except AttributeError:
-            pass
-        else:
-            unloader()
-
-        del cog
+        cog._eject(self)
 
     # extensions