Merge branch 'Pycord-Development:master' into master

Author: BobDotCom

discord/app/commands.py

@@ -102,7 +102,7 @@ class ApplicationCommand(_BaseCommand):
     cog = None
 
     def __repr__(self):
-        return f"<discord.app.commands.{self.__class__.__name__} name={self.name}>"
+        return f"<discord.commands.{self.__class__.__name__} name={self.name}>"
 
     def __eq__(self, other):
         return isinstance(other, self.__class__)
@@ -507,21 +507,20 @@ def __init__(
         self._converter = None
         self.channel_types: List[SlashCommandOptionType] = kwargs.pop("channel_types", [])
         if not isinstance(input_type, SlashCommandOptionType):
-            to_assign = input_type() if isinstance(input_type, type) else input_type
-            _type = SlashCommandOptionType.from_datatype(to_assign.__class__)
-            if _type == SlashCommandOptionType.custom:
-                self._converter = to_assign
+            if hasattr(input_type, "convert"):
+                self._converter = input_type
                 input_type = SlashCommandOptionType.string
-            elif _type == SlashCommandOptionType.channel:
-                if not isinstance(input_type, tuple):
-                    input_type = (input_type,)
-                for i in input_type:
-                    if i.__name__ == 'GuildChannel':
-                        continue
-
-                    channel_type = channel_type_map[i.__name__]
-                    self.channel_types.append(channel_type)
             else:
+                _type = SlashCommandOptionType.from_datatype(input_type)
+                if _type == SlashCommandOptionType.channel:
+                    if not isinstance(input_type, tuple):
+                        input_type = (input_type,)
+                    for i in input_type:
+                        if i.__name__ == 'GuildChannel':
+                            continue
+
+                        channel_type = channel_type_map[i.__name__]
+                        self.channel_types.append(channel_type)
                 input_type = _type
         self.input_type = input_type
         self.required: bool = kwargs.pop("required", True)
@@ -546,7 +545,7 @@ def to_dict(self) -> Dict:
 
 
     def __repr__(self):
-        return f"<discord.app.commands.{self.__class__.__name__} name={self.name}>"
+        return f"<discord.commands.{self.__class__.__name__} name={self.name}>"
 
 
 class OptionChoice:

discord/commands/commands.py

@@ -113,8 +113,8 @@ def followup(self):
         return self.interaction.followup
 
     async def delete(self):
-        """Calls :attr:`~discord.app.ApplicationContext.respond`.
-        If the response is done, then calls :attr:`~discord.app.ApplicationContext.respond` first."""
+        """Calls :attr:`~discord.commands.ApplicationContext.respond`.
+        If the response is done, then calls :attr:`~discord.commands.ApplicationContext.respond` first."""
         if not self.response.is_done():
             await self.defer()
 

discord/commands/context.py

@@ -18,7 +18,7 @@ async def add(ctx, num1: int, num2: int):
 
 # another way, creating the class manually
 
-from discord.app import SlashCommandGroup
+from discord.commands import SlashCommandGroup
 
 math = SlashCommandGroup("math", "Commands related to mathematics.")
 

examples/app_commands/slash_groups.py

@@ -73,13 +73,14 @@
       extras_require=extras_require,
       python_requires='>=3.8.0',
       classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 3 - Alpha',
         'License :: OSI Approved :: MIT License',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10'
         'Topic :: Internet',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',