fixed style issues

Author: kvsxxx

discord_ui/client.py

@@ -23,7 +23,7 @@
 from typing import Coroutine, Dict, List, Tuple, Union
 try:
     from typing import Literal
-except:
+except ImportError:
     from typing_extensions import Literal
 
 logging = setup_logger(__name__)
@@ -289,7 +289,7 @@ async def sync_commands(self, delete_unused=None):
         Raises
         ------
             :raises: :class:`InvalidArgument` : A slash command has an invalid guild_id
-            :raises: :class:`InvalidArgument` : A slash command has an invalid id specified in the guild_permissions 
+            :raises: :class:`InvalidArgument` : A slash command has an invalid id specified in the guild_permissions
         
         """
         delete_unused = delete_unused or self.delete_unused
@@ -740,7 +740,7 @@ async def nuke_commands(self):
         logging.info("nuked all commands")
 
 
-    def add_command(self, name, callback=None, description=MISSING, options=[], guild_ids=MISSING, default_permission=True, guild_permissions=MISSING, api=False) -> Union[None, Coroutine]:
+    def add_command(self, name, callback=None, description=MISSING, options=MISSING, guild_ids=MISSING, default_permission=True, guild_permissions=MISSING, api=False) -> Union[None, Coroutine]:
         """
         Adds a new slashcommand
 
@@ -776,7 +776,7 @@ def add_command(self, name, callback=None, description=MISSING, options=[], guil
             if self.ready is False:
                 raise Exception("Slashcommands are not ready yet")
             return self.create_command(command) 
-    def command(self, name=MISSING, description=MISSING, options=[], guild_ids=MISSING, default_permission=True, guild_permissions=MISSING):
+    def command(self, name=MISSING, description=MISSING, options=MISSING, guild_ids=MISSING, default_permission=True, guild_permissions=MISSING):
         """
         A decorator for a slash command
         

discord_ui/cogs.py

@@ -9,11 +9,10 @@
 
 import asyncio
 import datetime
-import inspect
-from typing import Optional, Union
+from typing import Optional
 try:
     from typing import Literal
-except:
+except ImportError:
     from typing_extensions import Literal
 
 class WrongListener(errors.CheckFailure):

discord_ui/component_list.py

@@ -1,17 +1,16 @@
-from discord.ext.commands.cooldowns import C
-from .receive import Interaction
-from .components import Button, Component
-from .cogs import ListeningComponent
-from .tools import MISSING
+# from .receive import Interaction
+# from .components import Button, Component
+# from .cogs import ListeningComponent
+# from .tools import MISSING
 
-from typing import List
-from inspect import getmembers
+# from typing import List
+# from inspect import getmembers
 
 # .send(..., component_list=ComponentList(client))
 
 
-class _ListeningComp():
-    pass
+# class _ListeningComp():
+#     pass
 
 # class ListeningButton(ListeningComponent, Button):
 #     def __init__(self, callback, custom_id, label="\u200b", color="blurple", emoji=MISSING, new_line=False, disabled=False) -> None:

discord_ui/receive.py

@@ -13,7 +13,7 @@
 from typing import List, Union, Dict
 try:
     from typing import Literal
-except:
+except ImportError:
     from typing_extensions import Literal
 
 logging = setup_logger("discord-ui")
@@ -104,7 +104,7 @@ async def respond(self, content=MISSING, *, tts=False, embed=MISSING, embeds=MIS
         ----------
         content: :class:`str`, optional
             The raw message content
-        tts: :class:`bool` 
+        tts: :class:`bool`
             Whether the message should be send with text-to-speech
         embed: :class:`discord.Embed`
             Embed rich content
@@ -466,7 +466,7 @@ async def disable_action_row(self, row, disable = True):
         Raises
         ------
             :raises: :class:`discord_ui.errors.OutOfValidRange` : The specified range was out of the possible range of the component rows 
-            :raises: :class:`discord_ui.errors.OutOfValidRange` : The specified row was out of the possible range of the component rows 
+            :raises: :class:`discord_ui.errors.OutOfValidRange` : The specified row was out of the possible range of the component rows
         
         """
         comps = []
@@ -529,7 +529,7 @@ async def wait_for(self, event_name: Literal["select", "button"], client, custom
         Parameters
         -----------
             event_name: :class:`str`
-                The name of the event which will be awaited [``"select"`` | ``"button"``] 
+                The name of the event which will be awaited [``"select"`` | ``"button"``]
                 
                 .. note::
 

discord_ui/slash/types.py

@@ -47,12 +47,12 @@ def __init__(self, argument_type, name, description=None, required=False, choice
         self._json = {}
         self.argument_type = argument_type
         self.name = name
-        self.description = description or self.name
+        self.description = _or(description, self.name)
         if required is True:
-            self.required = required or []
-        if options is not MISSING:
-            self.options = options or []
-        if choices is not MISSING:
+            self.required = _default([], required)
+        if not _none(options):
+            self.options = _default([], options)
+        if not _none(choices):
             self._json["choices"] = choices
     def __repr__(self) -> str:
         return f"<discord_ui.SlashOption({str(self.to_dict())})>"
@@ -121,7 +121,7 @@ def choices(self) -> typing.List[dict]:
         
         .. note::
     
-            Choices are formated like this: ``[{"name": "name of the choice", "value": "the real value"}, ...]`` 
+            Choices are formated like this: ``[{"name": "name of the choice", "value": "the real value"}, ...]``
     
         :type: List[:class:`dict`]
         """
@@ -256,7 +256,7 @@ def __init__(self, allowed: dict=MISSING, forbidden=MISSING) -> None:
         
         Example
         ```py
-        SlashPermission(allowed=[                
+        SlashPermission(allowed=[
                 await bot.fetch_user(bot.owner_id)
             ], forbidden={
                 539459006847255232: SlashPermission.User,
@@ -347,10 +347,7 @@ def __init__(self, callback, name=MISSING, description=MISSING, options=MISSING,
             "type": CommandType.SLASH
         }
 
-        # Check options before callback because callback makes an option check
-        if options is MISSING:
-            options = []
-        self.options = options
+        self.options = _default([], options)
         if callback is not None:
             if not inspect.iscoroutinefunction(callback):
                 raise NoAsyncCallback()
@@ -410,7 +407,7 @@ def __eq__(self, o: object) -> bool:
             )
         elif isinstance(o, SlashCommand):
             return (
-                o._json('type') == self._json["type"] 
+                o._json('type') == self._json["type"]
                 and o.name == self.name
                 and o.description == self.description
                 and o.options == self.options
@@ -536,12 +533,12 @@ def __init__(self, callback, name=MISSING, description=MISSING, options=MISSING,
         async def my_function(command, parameter=None):
             pass
 
-        SlashCommand(callback=my_function, name="hello_world", description="This is a test command", 
+        SlashCommand(callback=my_function, name="hello_world", description="This is a test command",
             options=[
                 SlashOption(str, name="parameter", description="this is a parameter", choices=[{ "name": "choice 1", "value": 1 }])
-            ], guild_ids=[785567635802816595], default_permission=False, 
-            guild_permissions={ 
-                785567635802816595: SlashPermission(allowed={"539459006847254542": SlashPermission.USER}) 
+            ], guild_ids=[785567635802816595], default_permission=False,
+            guild_permissions={
+                785567635802816595: SlashPermission(allowed={"539459006847254542": SlashPermission.USER})
             })
         ```
         """

discord_ui/tools.py

@@ -20,7 +20,7 @@ def get(self, *args):
 def _none(*args, empty_array=False):
     return all(x in [None, MISSING] + [[], [[]]][empty_array is True] for x in args)
 def _or(*args, default=None):
-    for i in range(len(args)):
+    for i, _ in enumerate(args):
         if not _none(args[i]):
             return args[i]
     return default

examples/context_commands.py

@@ -1,6 +1,6 @@
 # Example by 404kuso
 # https://github.com/discord-py-ui/discord-ui/tree/main/examples/context_commands.py
-# 
+#
 #       This example will use the two new ui context commands,
 #       one will quote the message and one will send their avatar
 # Note:

examples/generate_linkbutton.py

@@ -1,6 +1,6 @@
 # Example by 404kuso
 # https://github.com/discord-py-ui/discord-ui/tree/main/examples/generate_linkbutton.py
-# 
+#
 #       This example will use a slash subcommand group and will generate a 
 #       linkbutton with a name, link and emoji which the user can specify
 # Note:
@@ -21,9 +21,9 @@
         # The user can specify the message content
         SlashOption(str, "message content", "the content of the message"),
         # The name of the linkbutton
-        SlashOption(str, "name", "the name of the button"), 
+        SlashOption(str, "name", "the name of the button"),
         # The link of the linkbutton
-        SlashOption(str, "link", "the link for the button"), 
+        SlashOption(str, "link", "the link for the button"),
         # The eomji of the linkbutton
         SlashOption(str, "emoji", "a emoji appearing before the text")
     ], 

examples/role_picker.py

@@ -6,7 +6,7 @@
 #
 # Note: For this example to work, the bot has to have the MANAGE_ROLES permission and the bot role
 #       has to be higher than the roles.
-#       Also, if you want to test this, replace '785567635802816595' in guild_ids=[] with a guild id of 
+#       Also, if you want to test this, replace '785567635802816595' in guild_ids=[] with a guild id of
 #       your choice, because guild slash commands are way faster than globals
 # 
 #       Replace '867715564155568158', '867715628504186911', '867715582903582743' and '867715674386071602'