Merge branch 'master' of https://github.com/Pycord-Development/pycord

Author: CodeWithSwastik

discord/app/commands.py

@@ -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)

discord/commands/commands.py

@@ -175,6 +175,8 @@ class Role(Hashable):
     unicode_emoji: Optional[:class:`str`]
         The role's unicode emoji.
         Only available to guilds that contain ``ROLE_ICONS`` in :attr:`Guild.features`.
+        
+        .. versionadded:: 2.0
     """
 
     __slots__ = (
@@ -328,7 +330,10 @@ def members(self) -> List[Member]:
 
     @property
     def icon(self) -> Optional[Asset]:
-        """Optional[:class:`Asset`]: Returns the role's icon asset, if available."""
+        """Optional[:class:`Asset`]: Returns the role's icon asset, if available.
+        
+        .. versionadded:: 2.0
+        """
         if self._icon is None:
             return None
 
@@ -384,7 +389,7 @@ async def edit(
             Can now pass ``int`` to ``colour`` keyword-only parameter.
 
         .. versionchanged:: 2.0
-            Edits are no longer in-place, the newly edited role is returned instead.
+            Edits are no longer in-place, the newly edited role is returned instead. Added ``icon`` and ``unicode_emoji``.
 
         Parameters
         -----------

discord/role.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',