From c30a2f3ca0b52f30d212af7af49ff9e797c7d702 Mon Sep 17 00:00:00 2001
From: Omkaar <79257339+Infiniticity@users.noreply.github.com>
Date: Mon, 3 Oct 2022 03:20:56 +0530
Subject: [PATCH] Refactor certain f-strings and literals
---
discord/app_commands/transformers.py | 14 +++++++-------
discord/ext/commands/flags.py | 4 ++--
discord/ext/tasks/__init__.py | 2 +-
discord/guild.py | 2 +-
discord/member.py | 2 +-
discord/message.py | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/discord/app_commands/transformers.py b/discord/app_commands/transformers.py
index 32cfe27a6..c481e40f5 100644
--- a/discord/app_commands/transformers.py
+++ b/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
diff --git a/discord/ext/commands/flags.py b/discord/ext/commands/flags.py
index 9951e75f3..e5ac3ed36 100644
--- a/discord/ext/commands/flags.py
+++ b/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)
diff --git a/discord/ext/tasks/__init__.py b/discord/ext/tasks/__init__.py
index a9b602f96..0eeecb0f7 100644
--- a/discord/ext/tasks/__init__.py
+++ b/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.
diff --git a/discord/guild.py b/discord/guild.py
index 3682fc615..510643fd7 100644
--- a/discord/guild.py
+++ b/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)
diff --git a/discord/member.py b/discord/member.py
index 7398a7d56..3a60fe814 100644
--- a/discord/member.py
+++ b/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')
diff --git a/discord/message.py b/discord/message.py
index 4348a89b2..770109787 100644
--- a/discord/message.py
+++ b/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,