Reformat entire project with ruff instead of black

Author: Rapptz

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         id: install-deps
         run: |
-          python -m pip install --upgrade pip setuptools wheel black==22.6 requests
+          python -m pip install --upgrade pip setuptools wheel ruff==0.12 requests
           pip install -U -r requirements.txt
 
       - name: Setup node.js
@@ -42,7 +42,7 @@ jobs:
           warnings: false
           no-comments: ${{ matrix.python-version != '3.x' }}
 
-      - name: Run black
+      - name: Run ruff
         if: ${{ always() && steps.install-deps.outcome == 'success' }}
         run: |
-          black --check discord examples
+          ruff format --check discord examples

discord/__init__.py

@@ -81,7 +81,7 @@ class VersionInfo(NamedTuple):
     major: int
     minor: int
     micro: int
-    releaselevel: Literal["alpha", "beta", "candidate", "final"]
+    releaselevel: Literal['alpha', 'beta', 'candidate', 'final']
     serial: int
 
 

discord/__main__.py

@@ -133,7 +133,7 @@ async def setup(bot):
     await bot.add_cog({name}(bot))
 '''
 
-_cog_extras = '''
+_cog_extras = """
     async def cog_load(self):
         # loading logic goes here
         pass
@@ -170,7 +170,7 @@ async def cog_after_invoke(self, ctx):
         # called after a command is called here
         pass
 
-'''
+"""
 
 
 # certain file names and directory names are forbidden

discord/abc.py

@@ -116,7 +116,7 @@
 
     PartialMessageableChannel = Union[TextChannel, VoiceChannel, StageChannel, Thread, DMChannel, PartialMessageable]
     MessageableChannel = Union[PartialMessageableChannel, GroupChannel]
-    SnowflakeTime = Union["Snowflake", datetime]
+    SnowflakeTime = Union['Snowflake', datetime]
 
     class PinnedMessage(Message):
         pinned_at: datetime
@@ -140,7 +140,7 @@ def __init__(self, iterator: AsyncIterator[PinnedMessage]) -> None:
 
     def __await__(self) -> Generator[Any, None, List[PinnedMessage]]:
         warnings.warn(
-            "`await <channel>.pins()` is deprecated; use `async for message in <channel>.pins()` instead.",
+            '`await <channel>.pins()` is deprecated; use `async for message in <channel>.pins()` instead.',
             DeprecationWarning,
             stacklevel=2,
         )
@@ -423,8 +423,7 @@ class GuildChannel:
 
     if TYPE_CHECKING:
 
-        def __init__(self, *, state: ConnectionState, guild: Guild, data: GuildChannelPayload):
-            ...
+        def __init__(self, *, state: ConnectionState, guild: Guild, data: GuildChannelPayload): ...
 
     def __str__(self) -> str:
         return self.name
@@ -794,7 +793,6 @@ def permissions_for(self, obj: Union[Member, Role], /) -> Permissions:
 
         default = self.guild.default_role
         if default is None:
-
             if self._state.self_id == obj.id:
                 return Permissions._user_installed_permissions(in_guild=True)
             else:
@@ -907,8 +905,7 @@ async def set_permissions(
         *,
         overwrite: Optional[Union[PermissionOverwrite, _Undefined]] = ...,
         reason: Optional[str] = ...,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def set_permissions(
@@ -917,8 +914,7 @@ async def set_permissions(
         *,
         reason: Optional[str] = ...,
         **permissions: Unpack[_PermissionOverwriteKwargs],
-    ) -> None:
-        ...
+    ) -> None: ...
 
     async def set_permissions(
         self,
@@ -1109,8 +1105,7 @@ async def move(
         category: Optional[Snowflake] = MISSING,
         sync_permissions: bool = MISSING,
         reason: Optional[str] = MISSING,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def move(
@@ -1121,8 +1116,7 @@ async def move(
         category: Optional[Snowflake] = MISSING,
         sync_permissions: bool = MISSING,
         reason: str = MISSING,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def move(
@@ -1133,8 +1127,7 @@ async def move(
         category: Optional[Snowflake] = MISSING,
         sync_permissions: bool = MISSING,
         reason: str = MISSING,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def move(
@@ -1145,8 +1138,7 @@ async def move(
         category: Optional[Snowflake] = MISSING,
         sync_permissions: bool = MISSING,
         reason: str = MISSING,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     async def move(self, **kwargs: Any) -> None:
         """|coro|
@@ -1428,8 +1420,7 @@ async def send(
         view: LayoutView,
         suppress_embeds: bool = ...,
         silent: bool = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1444,8 +1435,7 @@ async def send(
         view: LayoutView,
         suppress_embeds: bool = ...,
         silent: bool = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1465,8 +1455,7 @@ async def send(
         suppress_embeds: bool = ...,
         silent: bool = ...,
         poll: Poll = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1486,8 +1475,7 @@ async def send(
         suppress_embeds: bool = ...,
         silent: bool = ...,
         poll: Poll = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1507,8 +1495,7 @@ async def send(
         suppress_embeds: bool = ...,
         silent: bool = ...,
         poll: Poll = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1528,8 +1515,7 @@ async def send(
         suppress_embeds: bool = ...,
         silent: bool = ...,
         poll: Poll = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     async def send(
         self,
@@ -2029,7 +2015,7 @@ async def _before_strategy(retrieve: int, before: Optional[Snowflake], limit: Op
             if limit is None:
                 raise ValueError('history does not support around with limit=None')
             if limit > 101:
-                raise ValueError("history max limit 101 when specifying around parameter")
+                raise ValueError('history max limit 101 when specifying around parameter')
 
             # Strange Discord quirk
             limit = 100 if limit == 101 else limit

discord/activity.py

@@ -861,13 +861,11 @@ def __repr__(self) -> str:
 
 
 @overload
-def create_activity(data: ActivityPayload, state: ConnectionState) -> ActivityTypes:
-    ...
+def create_activity(data: ActivityPayload, state: ConnectionState) -> ActivityTypes: ...
 
 
 @overload
-def create_activity(data: None, state: ConnectionState) -> None:
-    ...
+def create_activity(data: None, state: ConnectionState) -> None: ...
 
 
 def create_activity(data: Optional[ActivityPayload], state: ConnectionState) -> Optional[ActivityTypes]:

discord/app_commands/checks.py

@@ -327,7 +327,7 @@ async def test(interaction: discord.Interaction):
 
     invalid = perms.keys() - Permissions.VALID_FLAGS.keys()
     if invalid:
-        raise TypeError(f"Invalid permission(s): {', '.join(invalid)}")
+        raise TypeError(f'Invalid permission(s): {", ".join(invalid)}')
 
     def predicate(interaction: Interaction) -> bool:
         permissions = interaction.permissions
@@ -354,7 +354,7 @@ def bot_has_permissions(**perms: Unpack[_PermissionsKwargs]) -> Callable[[T], T]
 
     invalid = set(perms) - set(Permissions.VALID_FLAGS)
     if invalid:
-        raise TypeError(f"Invalid permission(s): {', '.join(invalid)}")
+        raise TypeError(f'Invalid permission(s): {", ".join(invalid)}')
 
     def predicate(interaction: Interaction) -> bool:
         permissions = interaction.app_permissions
@@ -371,7 +371,6 @@ def predicate(interaction: Interaction) -> bool:
 def _create_cooldown_decorator(
     key: CooldownFunction[Hashable], factory: CooldownFunction[Optional[Cooldown]]
 ) -> Callable[[T], T]:
-
     mapping: Dict[Any, Cooldown] = {}
 
     async def get_bucket(

discord/app_commands/commands.py

@@ -219,7 +219,7 @@ def validate_context_menu_name(name: str) -> str:
 
 
 def validate_auto_complete_callback(
-    callback: AutocompleteCallback[GroupT, ChoiceT]
+    callback: AutocompleteCallback[GroupT, ChoiceT],
 ) -> AutocompleteCallback[GroupT, ChoiceT]:
     # This function needs to ensure the following is true:
     # If self.foo is passed then don't pass command.binding to the callback
@@ -1491,9 +1491,9 @@ class shortened to 100 characters.
     __discord_app_commands_installation_types__: Optional[AppInstallationType] = MISSING
     __discord_app_commands_default_permissions__: Optional[Permissions] = MISSING
     __discord_app_commands_has_module__: bool = False
-    __discord_app_commands_error_handler__: Optional[
-        Callable[[Interaction, AppCommandError], Coroutine[Any, Any, None]]
-    ] = None
+    __discord_app_commands_error_handler__: Optional[Callable[[Interaction, AppCommandError], Coroutine[Any, Any, None]]] = (
+        None
+    )
 
     def __init_subclass__(
         cls,
@@ -2484,13 +2484,11 @@ def decorator(func: CheckInputParameter) -> CheckInputParameter:
 
 
 @overload
-def guild_only(func: None = ...) -> Callable[[T], T]:
-    ...
+def guild_only(func: None = ...) -> Callable[[T], T]: ...
 
 
 @overload
-def guild_only(func: T) -> T:
-    ...
+def guild_only(func: T) -> T: ...
 
 
 def guild_only(func: Optional[T] = None) -> Union[T, Callable[[T], T]]:
@@ -2541,13 +2539,11 @@ def inner(f: T) -> T:
 
 
 @overload
-def private_channel_only(func: None = ...) -> Callable[[T], T]:
-    ...
+def private_channel_only(func: None = ...) -> Callable[[T], T]: ...
 
 
 @overload
-def private_channel_only(func: T) -> T:
-    ...
+def private_channel_only(func: T) -> T: ...
 
 
 def private_channel_only(func: Optional[T] = None) -> Union[T, Callable[[T], T]]:
@@ -2598,13 +2594,11 @@ def inner(f: T) -> T:
 
 
 @overload
-def dm_only(func: None = ...) -> Callable[[T], T]:
-    ...
+def dm_only(func: None = ...) -> Callable[[T], T]: ...
 
 
 @overload
-def dm_only(func: T) -> T:
-    ...
+def dm_only(func: T) -> T: ...
 
 
 def dm_only(func: Optional[T] = None) -> Union[T, Callable[[T], T]]:
@@ -2697,13 +2691,11 @@ def inner(f: T) -> T:
 
 
 @overload
-def guild_install(func: None = ...) -> Callable[[T], T]:
-    ...
+def guild_install(func: None = ...) -> Callable[[T], T]: ...
 
 
 @overload
-def guild_install(func: T) -> T:
-    ...
+def guild_install(func: T) -> T: ...
 
 
 def guild_install(func: Optional[T] = None) -> Union[T, Callable[[T], T]]:
@@ -2748,13 +2740,11 @@ def inner(f: T) -> T:
 
 
 @overload
-def user_install(func: None = ...) -> Callable[[T], T]:
-    ...
+def user_install(func: None = ...) -> Callable[[T], T]: ...
 
 
 @overload
-def user_install(func: T) -> T:
-    ...
+def user_install(func: T) -> T: ...
 
 
 def user_install(func: Optional[T] = None) -> Union[T, Callable[[T], T]]:

discord/app_commands/namespace.py

@@ -181,7 +181,7 @@ def _get_resolved_items(cls, interaction: Interaction, resolved: ResolvedData) -
         guild_id = interaction.guild_id
         guild = interaction.guild
         type = AppCommandOptionType.user.value
-        for (user_id, user_data) in resolved.get('users', {}).items():
+        for user_id, user_data in resolved.get('users', {}).items():
             try:
                 member_data = members[user_id]
             except KeyError:
@@ -203,7 +203,7 @@ def _get_resolved_items(cls, interaction: Interaction, resolved: ResolvedData) -
         )
 
         type = AppCommandOptionType.channel.value
-        for (channel_id, channel_data) in resolved.get('channels', {}).items():
+        for channel_id, channel_data in resolved.get('channels', {}).items():
             key = ResolveKey(id=channel_id, type=type)
             if channel_data['type'] in (10, 11, 12):
                 # The guild ID can't be none in this case
@@ -220,7 +220,7 @@ def _get_resolved_items(cls, interaction: Interaction, resolved: ResolvedData) -
             }
         )
 
-        for (message_id, message_data) in resolved.get('messages', {}).items():
+        for message_id, message_data in resolved.get('messages', {}).items():
             channel_id = int(message_data['channel_id'])
             if guild is None:
                 channel = PartialMessageable(state=state, guild_id=guild_id, id=channel_id)