Refactor certain f-strings and literals

discord/app_commands/transformers.py

@@ -431,7 +431,7 @@ class EnumValueTransformer(Transformer):
 
         values = list(enum)
         if len(values) < 2:
-            raise TypeError(f'enum.Enum requires at least two values.')
+            raise TypeError('enum.Enum requires at least two values.')
 
         first = type(values[0].value)
         if first is int:
@@ -469,7 +469,7 @@ class EnumNameTransformer(Transformer):
 
         values = list(enum)
         if len(values) < 2:
-            raise TypeError(f'enum.Enum requires at least two values.')
+            raise TypeError('enum.Enum requires at least two values.')
 
         self._enum: Any = enum
         self._choices = [Choice(name=v.name, value=v.name) for v in values]
@@ -531,7 +531,7 @@ else:
                 raise TypeError(f'expected tuple for arguments, received {items.__class__.__name__} instead')
 
             if len(items) != 2:
-                raise TypeError(f'Transform only accepts exactly two arguments')
+                raise TypeError('Transform only accepts exactly two arguments')
 
             _, transformer = items
 
@@ -635,7 +635,7 @@ class BaseChannelTransformer(Transformer):
                 try:
                     types.extend(CHANNEL_TO_TYPES[t])
                 except KeyError:
-                    raise TypeError(f'Union type of channels must be entirely made up of channels') from None
+                    raise TypeError('Union type of channels must be entirely made up of channels') from None
 
         self._types: Tuple[Type[Any]] = channel_types
         self._channel_types: List[ChannelType] = types
@@ -763,7 +763,7 @@ def get_supported_annotation(
             else:
                 return (EnumNameTransformer(annotation), MISSING, False)
         if annotation is Choice:
-            raise TypeError(f'Choice requires a type argument of int, str, or float')
+            raise TypeError('Choice requires a type argument of int, str, or float')
 
         # Check if a transform @classmethod is given to the class
         # These flatten into simple "inline" transformers with implicit strings
@@ -771,9 +771,9 @@ def get_supported_annotation(
         if isinstance(transform_classmethod, classmethod):
             params = inspect.signature(transform_classmethod.__func__).parameters
             if len(params) != 3:
-                raise TypeError(f'Inline transformer with transform classmethod requires 3 parameters')
+                raise TypeError('Inline transformer with transform classmethod requires 3 parameters')
             if not inspect.iscoroutinefunction(transform_classmethod.__func__):
-                raise TypeError(f'Inline transformer with transform classmethod must be a coroutine')
+                raise TypeError('Inline transformer with transform classmethod must be a coroutine')
             return (InlineTransformer(annotation), MISSING, False)
 
     # Check if there's an origin

discord/ext/commands/flags.py

@@ -340,9 +340,9 @@ class FlagsMeta(type):
             aliases = {key.casefold(): value.casefold() for key, value in aliases.items()}
             regex_flags = re.IGNORECASE
 
-        keys = list(re.escape(k) for k in flags)
+        keys = [re.escape(k) for k in flags]
         keys.extend(re.escape(a) for a in aliases)
-        keys = sorted(keys, key=lambda t: len(t), reverse=True)
+        keys = sorted(keys, key=len, reverse=True)
 
         joined = '|'.join(keys)
         pattern = re.compile(f'(({re.escape(prefix)})(?P<flag>{joined}){re.escape(delimiter)})', regex_flags)

discord/ext/tasks/__init__.py

@@ -491,7 +491,7 @@ class Loop(Generic[LF]):
 
             This operation obviously cannot be undone!
         """
-        self._valid_exception = tuple()
+        self._valid_exception = ()
 
     def remove_exception_type(self, *exceptions: Type[BaseException]) -> bool:
         r"""Removes exception types from being handled during the reconnect logic.

discord/guild.py

@@ -544,7 +544,7 @@ class Guild(Hashable):
             if cache_joined or member.id == self_id or (cache_voice and member.id in self._voice_states):
                 self._add_member(member)
 
-        empty_tuple = tuple()
+        empty_tuple = ()
         for presence in data.get('presences', []):
             user_id = int(presence['user']['id'])
             member = self.get_member(user_id)

discord/member.py

@@ -348,7 +348,7 @@ class Member(discord.abc.Messageable, _UserTag):
         self.premium_since: Optional[datetime.datetime] = utils.parse_time(data.get('premium_since'))
         self._roles: utils.SnowflakeList = utils.SnowflakeList(map(int, data['roles']))
         self._client_status: _ClientStatus = _ClientStatus()
-        self.activities: Tuple[ActivityTypes, ...] = tuple()
+        self.activities: Tuple[ActivityTypes, ...] = ()
         self.nick: Optional[str] = data.get('nick', None)
         self.pending: bool = data.get('pending', False)
         self._avatar: Optional[str] = data.get('avatar')

discord/message.py

@@ -1776,7 +1776,7 @@ class Message(PartialMessage, Hashable):
                 return '@deleted-role'
 
             def resolve_channel(id: int) -> str:
-                return f'#deleted-channel'
+                return '#deleted-channel'
 
         transforms = {
             '@': resolve_member,