🚨 Fix ruff warnings and format code

Author: Paillat-dev

.pre-commit-config.yaml

@@ -4,14 +4,14 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
         exclude: \.(po|pot|yml|yaml)$
       - id: end-of-file-fixer
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.9
+    rev: v0.12.9
     hooks:
       - id: ruff
         args: [ --fix ]

discord/abc.py

@@ -1547,9 +1547,7 @@ async def send(
             components = view.to_components()
             if view.is_components_v2():
                 if embeds or content:
-                    raise TypeError(
-                        "cannot send embeds or content with a view using v2 component logic"
-                    )
+                    raise TypeError("cannot send embeds or content with a view using v2 component logic")
                 flags.is_components_v2 = True
         else:
             components = None

discord/channel.py

@@ -1269,9 +1269,7 @@ async def create_thread(
             components = view.to_components()
             if view.is_components_v2():
                 if embeds or content:
-                    raise TypeError(
-                        "cannot send embeds or content with a view using v2 component logic"
-                    )
+                    raise TypeError("cannot send embeds or content with a view using v2 component logic")
                 flags.is_components_v2 = True
         else:
             components = None

discord/client.py

@@ -540,9 +540,7 @@ async def on_error(self, event_method: str, *args: Any, **kwargs: Any) -> None:
         print(f"Ignoring exception in {event_method}", file=sys.stderr)
         traceback.print_exc()
 
-    async def on_view_error(
-        self, error: Exception, item: Item, interaction: Interaction
-    ) -> None:
+    async def on_view_error(self, error: Exception, item: Item, interaction: Interaction) -> None:
         """|coro|
 
         The default view error handler provided by the client.
@@ -554,9 +552,7 @@ async def on_view_error(
             f"Ignoring exception in view {interaction.view} for item {item}:",
             file=sys.stderr,
         )
-        traceback.print_exception(
-            error.__class__, error, error.__traceback__, file=sys.stderr
-        )
+        traceback.print_exception(error.__class__, error, error.__traceback__, file=sys.stderr)
 
     async def on_modal_error(self, error: Exception, interaction: Interaction) -> None:
         """|coro|
@@ -568,9 +564,7 @@ async def on_modal_error(self, error: Exception, interaction: Interaction) -> No
         """
 
         print(f"Ignoring exception in modal {interaction.modal}:", file=sys.stderr)
-        traceback.print_exception(
-            error.__class__, error, error.__traceback__, file=sys.stderr
-        )
+        traceback.print_exception(error.__class__, error, error.__traceback__, file=sys.stderr)
 
     # hooks
 

discord/collectibles.py

@@ -50,7 +50,7 @@ def __init__(self, data: NameplatePayload, state: "ConnectionState") -> None:
         self.palette: str = data["palette"]
         self._label: str = data["label"]
         self._asset: str = data["asset"]
-        self._state: "ConnectionState" = state
+        self._state: ConnectionState = state
 
     def __repr__(self) -> str:
         return f"<Nameplate sku_id={self.sku_id} palette={self.palette}>"

discord/commands/core.py

@@ -782,21 +782,15 @@ def _parse_options(self, params, *, check_params: bool = True) -> list[Option]:
             if self._is_typing_literal(option):
                 literal_values = get_args(option)
                 if not all(isinstance(v, (str, int, float)) for v in literal_values):
-                    raise TypeError(
-                        "Literal values for choices must be str, int, or float."
-                    )
+                    raise TypeError("Literal values for choices must be str, int, or float.")
 
                 value_type = type(literal_values[0])
                 if not all(isinstance(v, value_type) for v in literal_values):
-                    raise TypeError(
-                        "All Literal values for choices must be of the same type."
-                    )
+                    raise TypeError("All Literal values for choices must be of the same type.")
 
                 option = Option(
                     value_type,
-                    choices=[
-                        OptionChoice(name=str(v), value=v) for v in literal_values
-                    ],
+                    choices=[OptionChoice(name=str(v), value=v) for v in literal_values],
                 )
 
             if self._is_typing_annotated(option):

discord/components.py

@@ -165,9 +165,7 @@ class ActionRow(Component):
     def __init__(self, data: ComponentPayload):
         self.type: ComponentType = try_enum(ComponentType, data["type"])
         self.id: int = data.get("id")
-        self.children: list[Component] = [
-            _component_factory(d) for d in data.get("components", [])
-        ]
+        self.children: list[Component] = [_component_factory(d) for d in data.get("components", [])]
 
     @property
     def width(self):
@@ -189,9 +187,7 @@ def walk_components(self) -> Iterator[Component]:
 
     @classmethod
     def with_components(cls, *components, id=None):
-        return cls._raw_construct(
-            type=ComponentType.action_row, id=id, children=[c for c in components]
-        )
+        return cls._raw_construct(type=ComponentType.action_row, id=id, children=[c for c in components])
 
 
 class InputText(Component):
@@ -592,9 +588,7 @@ class Section(Component):
     def __init__(self, data: SectionComponentPayload, state=None):
         self.type: ComponentType = try_enum(ComponentType, data["type"])
         self.id: int = data.get("id")
-        self.components: list[Component] = [
-            _component_factory(d, state=state) for d in data.get("components", [])
-        ]
+        self.components: list[Component] = [_component_factory(d, state=state) for d in data.get("components", [])]
         self.accessory: Component | None = None
         if _accessory := data.get("accessory"):
             self.accessory = _component_factory(_accessory, state=state)
@@ -665,9 +659,7 @@ class UnfurledMediaItem(AssetMixin):
     def __init__(self, url: str):
         self._state = None
         self._url: str = url
-        self._static_url: str | None = (
-            url if url and url.startswith("attachment://") else None
-        )
+        self._static_url: str | None = url if url and url.startswith("attachment://") else None
         self.proxy_url: str | None = None
         self.height: int | None = None
         self.width: int | None = None
@@ -676,9 +668,7 @@ def __init__(self, url: str):
         self.attachment_id: int | None = None
 
     def __repr__(self) -> str:
-        return (
-            f"<UnfurledMediaItem url={self.url!r} attachment_id={self.attachment_id}>"
-        )
+        return f"<UnfurledMediaItem url={self.url!r} attachment_id={self.attachment_id}>"
 
     def __str__(self) -> str:
         return self.url or self.__repr__()
@@ -691,13 +681,10 @@ def url(self) -> str:
     @url.setter
     def url(self, value: str) -> None:
         self._url = value
-        self._static_url = (
-            value if value and value.startswith("attachment://") else None
-        )
+        self._static_url = value if value and value.startswith("attachment://") else None
 
     @classmethod
     def from_dict(cls, data: UnfurledMediaItemPayload, state=None) -> UnfurledMediaItem:
-
         r = cls(data.get("url"))
         r.proxy_url = data.get("proxy_url")
         r.height = data.get("height")
@@ -747,9 +734,7 @@ class Thumbnail(Component):
     def __init__(self, data: ThumbnailComponentPayload, state=None):
         self.type: ComponentType = try_enum(ComponentType, data["type"])
         self.id: int = data.get("id")
-        self.media: UnfurledMediaItem = (
-            umi := data.get("media")
-        ) and UnfurledMediaItem.from_dict(umi, state=state)
+        self.media: UnfurledMediaItem = (umi := data.get("media")) and UnfurledMediaItem.from_dict(umi, state=state)
         self.description: str | None = data.get("description")
         self.spoiler: bool | None = data.get("spoiler")
 
@@ -800,9 +785,7 @@ def is_dispatchable(self) -> bool:
 
     @classmethod
     def from_dict(cls, data: MediaGalleryItemPayload, state=None) -> MediaGalleryItem:
-        media = (umi := data.get("media")) and UnfurledMediaItem.from_dict(
-            umi, state=state
-        )
+        media = (umi := data.get("media")) and UnfurledMediaItem.from_dict(umi, state=state)
         description = data.get("description")
         spoiler = data.get("spoiler", False)
 
@@ -851,9 +834,7 @@ class MediaGallery(Component):
     def __init__(self, data: MediaGalleryComponentPayload, state=None):
         self.type: ComponentType = try_enum(ComponentType, data["type"])
         self.id: int = data.get("id")
-        self.items: list[MediaGalleryItem] = [
-            MediaGalleryItem.from_dict(d, state=state) for d in data.get("items", [])
-        ]
+        self.items: list[MediaGalleryItem] = [MediaGalleryItem.from_dict(d, state=state) for d in data.get("items", [])]
 
     def to_dict(self) -> MediaGalleryComponentPayload:
         return {
@@ -903,9 +884,7 @@ def __init__(self, data: FileComponentPayload, state=None):
         self.id: int = data.get("id")
         self.name: str = data.get("name")
         self.size: int = data.get("size")
-        self.file: UnfurledMediaItem = UnfurledMediaItem.from_dict(
-            data.get("file", {}), state=state
-        )
+        self.file: UnfurledMediaItem = UnfurledMediaItem.from_dict(data.get("file", {}), state=state)
         self.spoiler: bool | None = data.get("spoiler")
 
     def to_dict(self) -> FileComponentPayload:
@@ -948,9 +927,7 @@ def __init__(self, data: SeparatorComponentPayload):
         self.type: ComponentType = try_enum(ComponentType, data["type"])
         self.id: int = data.get("id")
         self.divider: bool = data.get("divider")
-        self.spacing: SeparatorSpacingSize = try_enum(
-            SeparatorSpacingSize, data.get("spacing", 1)
-        )
+        self.spacing: SeparatorSpacingSize = try_enum(SeparatorSpacingSize, data.get("spacing", 1))
 
     def to_dict(self) -> SeparatorComponentPayload:
         return {
@@ -1008,9 +985,7 @@ def __init__(self, data: ContainerComponentPayload, state=None):
             c
         )  # at this point, not adding alternative spelling
         self.spoiler: bool | None = data.get("spoiler")
-        self.components: list[Component] = [
-            _component_factory(d, state=state) for d in data.get("components", [])
-        ]
+        self.components: list[Component] = [_component_factory(d, state=state) for d in data.get("components", [])]
 
     def to_dict(self) -> ContainerComponentPayload:
         payload = {

discord/ext/commands/converter.py

@@ -1050,11 +1050,7 @@ def get_converter(param: inspect.Parameter) -> Any:
 
 
 def is_generic_type(tp: Any, *, _GenericAlias: type = _GenericAlias) -> bool:
-    return (
-        isinstance(tp, type)
-        and issubclass(tp, Generic)
-        or isinstance(tp, _GenericAlias)
-    )  # type: ignore
+    return isinstance(tp, type) and issubclass(tp, Generic) or isinstance(tp, _GenericAlias)  # type: ignore
 
 
 CONVERTER_MAPPING: dict[type[Any], Any] = {

discord/ext/pages/pagination.py

@@ -149,9 +149,7 @@ def __init__(
         **kwargs,
     ):
         if content is None and embeds is None and custom_view is None:
-            raise discord.InvalidArgument(
-                "A page must at least have content, embeds, or custom_view set."
-            )
+            raise discord.InvalidArgument("A page must at least have content, embeds, or custom_view set.")
         self._content = content
         self._embeds = embeds or []
         self._custom_view = custom_view
@@ -562,11 +560,9 @@ async def disable(
         """
         page = self.get_page_content(page)
         for item in self.walk_children():
-            if (
-                include_custom
-                or not self.custom_view
-                or item not in self.custom_view.children
-            ) and hasattr(item, "disabled"):
+            if (include_custom or not self.custom_view or item not in self.custom_view.children) and hasattr(
+                item, "disabled"
+            ):
                 item.disabled = True
         if page:
             await self.message.edit(

discord/guild.py

@@ -2260,7 +2260,7 @@ async def templates(self) -> list[Template]:
         Forbidden
             You don't have permissions to get the templates.
         """
-        from .template import Template
+        from .template import Template  # noqa: PLC0415
 
         data = await self._state.http.guild_templates(self.id)
         return [Template(data=d, state=self._state) for d in data]
@@ -2283,7 +2283,7 @@ async def webhooks(self) -> list[Webhook]:
             You don't have permissions to get the webhooks.
         """
 
-        from .webhook import Webhook
+        from .webhook import Webhook  # noqa: PLC0415
 
         data = await self._state.http.guild_webhooks(self.id)
         return [Webhook.from_state(d, state=self._state) for d in data]
@@ -2373,7 +2373,7 @@ async def create_template(self, *, name: str, description: str | utils.Undefined
         description: :class:`str`
             The description of the template.
         """
-        from .template import Template
+        from .template import Template  # noqa: PLC0415
 
         payload = {"name": name}
 
@@ -2919,9 +2919,7 @@ async def create_role(
             fields["colors"] = actual_colours._to_dict()
         else:
             raise InvalidArgument(
-                "colours parameter must be of type RoleColours, not {0.__class__.__name__}".format(
-                    actual_colours
-                )
+                "colours parameter must be of type RoleColours, not {}".format(actual_colours.__class__.__name__)
             )
 
         if hoist is not MISSING: