chore: fix new ruff complaints

tandemdude · Dec 6, 2024 · 6bcac87 · 6bcac87
1 parent c690a9c
commit 6bcac87
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 33 deletions.
diff --git a/lightbulb/client.py b/lightbulb/client.py
@@ -424,7 +424,7 @@ def error_handler(
             sorted_handlers = sorted(self._error_handlers.items(), key=lambda item: item[0], reverse=True)
             self._error_handlers = {k: v for k, v in sorted_handlers}
 
-            return t.cast(ErrorHandlerT, wrapped)
+            return t.cast("ErrorHandlerT", wrapped)
 
         def _inner(func_: ErrorHandlerT) -> ErrorHandlerT:
             return self.error_handler(func_, priority=priority)
@@ -447,7 +447,7 @@ def remove_error_handler(self, func: lb_types.ErrorHandler) -> None:
                 h for h in handlers if h is not func and (isinstance(h, di_.AutoInjecting) and h._func is not func)
             ]
             if handlers:
-                new_handlers[priority] = t.cast(list[lb_types.ErrorHandler], handlers)
+                new_handlers[priority] = t.cast("list[lb_types.ErrorHandler]", handlers)
 
         sorted_handlers = sorted(new_handlers.items(), key=lambda item: item[0], reverse=True)
         self._error_handlers = {k: v for k, v in sorted_handlers}

diff --git a/lightbulb/commands/commands.py b/lightbulb/commands/commands.py
@@ -265,7 +265,7 @@ def __new__(cls, cls_name: str, bases: tuple[type, ...], attrs: dict[str, t.Any]
 
         # Don't want to use a set for deduplicating because we want to preserve ordering
         hooks: list[t.Any] = []
-        for hook in t.cast(Iterable[t.Any], raw_hooks or []):
+        for hook in t.cast("Iterable[t.Any]", raw_hooks or []):
             if hook in hooks:
                 continue
             hooks.append(hook)
@@ -353,7 +353,7 @@ def _resolve_option(self, option: options_.Option[T, D]) -> T | D:
             raise RuntimeError("cannot resolve option if no context is available")
 
         if option._data._localized_name in self._resolved_option_cache:
-            return t.cast(T, self._resolved_option_cache[option._data._localized_name])
+            return t.cast("T", self._resolved_option_cache[option._data._localized_name])
 
         found = [opt for opt in context.options if opt.name == option._data._localized_name]
 
@@ -366,7 +366,7 @@ def _resolve_option(self, option: options_.Option[T, D]) -> T | D:
 
         if option._data.type in _PRIMITIVE_OPTION_TYPES:
             self._resolved_option_cache[option._data._localized_name] = found[0].value
-            return t.cast(T, found[0].value)
+            return t.cast("T", found[0].value)
 
         snowflake = found[0].value
         resolved = context.interaction.resolved
@@ -388,7 +388,7 @@ def _resolve_option(self, option: options_.Option[T, D]) -> T | D:
             raise TypeError("unsupported option type passed")
 
         self._resolved_option_cache[option._data._localized_name] = resolved_option
-        return t.cast(T, resolved_option)
+        return t.cast("T", resolved_option)
 
     @classmethod
     async def as_command_builder(
@@ -487,7 +487,7 @@ async def invoke(self, ctx: lightbulb.Context):
 
     __slots__ = ()
 
-    target: hikari.User = t.cast(hikari.User, options_.ContextMenuOption(hikari.User))
+    target: hikari.User = t.cast("hikari.User", options_.ContextMenuOption(hikari.User))
     """The target user that the context menu command was executed on."""
 
 
@@ -526,5 +526,5 @@ async def invoke(self, ctx: lightbulb.Context):
 
     __slots__ = ()
 
-    target: hikari.Message = t.cast(hikari.Message, options_.ContextMenuOption(hikari.Message))
+    target: hikari.Message = t.cast("hikari.Message", options_.ContextMenuOption(hikari.Message))
     """The target message that the context menu command was executed on."""
diff --git a/lightbulb/commands/groups.py b/lightbulb/commands/groups.py
@@ -88,7 +88,7 @@ class Example(
             command._command_data.parent = self  # type: ignore[reportGeneralTypeIssues]
             return command
 
-        def _inner(_command: CommandT) -> CommandT:
+        def _inner(_command: CommandT) -> CommandT:  # noqa: RUF052
             return self.register(_command)
 
         return _inner

diff --git a/lightbulb/commands/options.py b/lightbulb/commands/options.py
@@ -322,7 +322,7 @@ def string(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        str,
+        "str",
         Option(
             OptionData(
                 type=hikari.OptionType.STRING,
@@ -372,7 +372,7 @@ def integer(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        int,
+        "int",
         Option(
             OptionData(
                 type=hikari.OptionType.INTEGER,
@@ -414,7 +414,7 @@ def boolean(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        bool,
+        "bool",
         Option(
             OptionData(
                 type=hikari.OptionType.BOOLEAN,
@@ -459,7 +459,7 @@ def number(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        float,
+        "float",
         Option(
             OptionData(
                 type=hikari.OptionType.FLOAT,
@@ -501,7 +501,7 @@ def user(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        hikari.User,
+        "hikari.User",
         Option(
             OptionData(
                 type=hikari.OptionType.USER,
@@ -540,7 +540,7 @@ def channel(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        hikari.PartialChannel,
+        "hikari.PartialChannel",
         Option(
             OptionData(
                 type=hikari.OptionType.CHANNEL,
@@ -578,7 +578,7 @@ def role(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        hikari.Role,
+        "hikari.Role",
         Option(
             OptionData(
                 type=hikari.OptionType.ROLE,
@@ -615,7 +615,7 @@ def mentionable(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        hikari.Snowflake,
+        "hikari.Snowflake",
         Option(
             OptionData(
                 type=hikari.OptionType.MENTIONABLE,
@@ -652,7 +652,7 @@ def attachment(
         Descriptor allowing access to the option value from within a command invocation.
     """
     return t.cast(
-        hikari.Attachment,
+        "hikari.Attachment",
         Option(
             OptionData(
                 type=hikari.OptionType.ATTACHMENT,

diff --git a/lightbulb/components/menus.py b/lightbulb/components/menus.py
@@ -42,8 +42,6 @@
 import asyncio
 import typing as t
 import uuid
-from collections.abc import Generator
-from collections.abc import Sequence
 
 import async_timeout
 import hikari
@@ -55,6 +53,8 @@
 if t.TYPE_CHECKING:
     from collections.abc import Awaitable
     from collections.abc import Callable
+    from collections.abc import Generator
+    from collections.abc import Sequence
 
     import typing_extensions as t_ex
 
@@ -343,7 +343,7 @@ def __init__(
         menu: Menu,
         interaction: hikari.ComponentInteraction,
         component: base.BaseComponent[special_endpoints.MessageActionRowBuilder],
-        _timeout: async_timeout.Timeout,
+        _timeout: async_timeout.Timeout,  # noqa: RUF052
     ) -> None:
         super().__init__()
 
@@ -428,7 +428,7 @@ def selected_values_for(self, select: Select[T]) -> Sequence[T]:
         if isinstance(select, TextSelect):
             # This is **not** unreachable, pyright is just a silly sausage, and I don't want
             # to add an overload for all the supported select types :D
-            return t.cast(Sequence[T], self.interaction.values)
+            return t.cast("Sequence[T]", self.interaction.values)
 
         resolved_data = self.interaction.resolved
         if resolved_data is None:

diff --git a/lightbulb/context.py b/lightbulb/context.py
@@ -153,7 +153,7 @@ class RestAutocompleteContext(AutocompleteContext[T]):
     def __init__(
         self,
         *args: t.Any,
-        _initial_response_callback: Callable[
+        _initial_response_callback: Callable[  # noqa: RUF052
             [hikari.api.InteractionAutocompleteBuilder],
             None,
         ],
@@ -518,7 +518,7 @@ class RestContext(Context):
     def __init__(
         self,
         *args: t.Any,
-        _initial_response_callback: Callable[
+        _initial_response_callback: Callable[  # noqa: RUF052
             [hikari.api.InteractionResponseBuilder],
             None,
         ],

diff --git a/lightbulb/di/solver.py b/lightbulb/di/solver.py
@@ -346,8 +346,8 @@ def __init__(
         self,
         func: Callable[..., Awaitable[t.Any]],
         self_: t.Any = None,
-        _cached_pos_or_kw_params: list[tuple[str, t.Any]] | None = None,
-        _cached_kw_only_params: dict[str, t.Any] | None = None,
+        _cached_pos_or_kw_params: list[tuple[str, t.Any]] | None = None,  # noqa: RUF052
+        _cached_kw_only_params: dict[str, t.Any] | None = None,  # noqa: RUF052
     ) -> None:
         self._func = func
         self._self: t.Any = self_

diff --git a/lightbulb/loaders.py b/lightbulb/loaders.py
@@ -25,16 +25,17 @@
 import abc
 import logging
 import typing as t
-from collections.abc import Awaitable
-from collections.abc import Callable
-from collections.abc import Sequence
 
 import hikari
 
 from lightbulb import di
 from lightbulb import tasks
 
 if t.TYPE_CHECKING:
+    from collections.abc import Awaitable
+    from collections.abc import Callable
+    from collections.abc import Sequence
+
     from lightbulb import client as client_
     from lightbulb.internal import types
 
@@ -349,7 +350,7 @@ async def message_create_listener(event: hikari.MessageCreateEvent) -> None:
         def _inner(
             callback: Callable["t.Concatenate[EventT, ...]", Awaitable[None]],
         ) -> Callable[[EventT], Awaitable[None]]:
-            wrapped = t.cast(Callable[[EventT], Awaitable[None]], di.with_di(callback))
+            wrapped = t.cast("Callable[[EventT], Awaitable[None]]", di.with_di(callback))
             self.add(_ListenerLoadable(wrapped, *event_types))
             return wrapped
 
@@ -380,7 +381,7 @@ def error_handler(
         if func is not None:
             wrapped = di.with_di(func)
             self.add(_ErrorHandlerLoadable(wrapped, priority))  # type: ignore[reportArgumentType]
-            return t.cast(ErrorHandlerT, wrapped)
+            return t.cast("ErrorHandlerT", wrapped)
 
         def _inner(func_: ErrorHandlerT) -> ErrorHandlerT:
             return self.error_handler(func_, priority=priority)

diff --git a/lightbulb/prefab/concurrency.py b/lightbulb/prefab/concurrency.py
@@ -22,7 +22,7 @@
 
 import collections
 
-import hikari  # noqa: TCH002
+import hikari  # noqa: TC002
 
 from lightbulb import context
 from lightbulb import utils

diff --git a/lightbulb/utils.py b/lightbulb/utils.py
@@ -77,4 +77,4 @@ async def maybe_await(item: types.MaybeAwaitable[T]) -> T:
     """
     if inspect.iscoroutine(item):
         return await item
-    return t.cast(T, item)
+    return t.cast("T", item)