From dc67d2bd8555ea37ff455b9077fb58712cc0f2fb Mon Sep 17 00:00:00 2001
From: Josh <josh.ja.butt@gmail.com>
Date: Mon, 3 May 2021 14:31:07 +1000
Subject: [PATCH] Replace uses of Ellipsis as sentinels with utils.MISSING
---
discord/abc.py | 8 +++++---
discord/asset.py | 14 ++++++++------
discord/webhook/async_.py | 2 +-
discord/webhook/sync.py | 2 +-
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/discord/abc.py b/discord/abc.py
index c9e740f2f..c77e25b80 100644
--- a/discord/abc.py
+++ b/discord/abc.py
@@ -56,6 +56,8 @@ if TYPE_CHECKING:
from .asset import Asset
+MISSING = utils.MISSING
+
class _Undefined:
def __repr__(self):
return 'see-below'
@@ -829,8 +831,8 @@ class GuildChannel(Protocol):
raise InvalidArgument('Only one of [before, after, end, beginning] can be used.')
bucket = self._sorting_bucket
- parent_id = kwargs.get('category', ...)
- if parent_id not in (..., None):
+ parent_id = kwargs.get('category', MISSING)
+ if parent_id not in (MISSING, None):
parent_id = parent_id.id
channels = [
ch
@@ -874,7 +876,7 @@ class GuildChannel(Protocol):
reason = kwargs.get('reason')
for index, channel in enumerate(channels):
d = {'id': channel.id, 'position': index}
- if parent_id is not ... and channel.id == self.id:
+ if parent_id is not MISSING and channel.id == self.id:
d.update(parent_id=parent_id, lock_permissions=lock_permissions)
payload.append(d)
diff --git a/discord/asset.py b/discord/asset.py
index 3785dca2f..bb1dc3f10 100644
--- a/discord/asset.py
+++ b/discord/asset.py
@@ -45,6 +45,8 @@ VALID_STATIC_FORMATS = frozenset({"jpeg", "jpg", "webp", "png"})
VALID_ASSET_FORMATS = VALID_STATIC_FORMATS | {"gif"}
+MISSING = utils.MISSING
+
class AssetMixin:
url: str
_state: Optional[Any]
@@ -254,9 +256,9 @@ class Asset(AssetMixin):
def replace(
self,
- size: int = ...,
- format: ValidAssetFormatTypes = ...,
- static_format: ValidStaticFormatTypes = ...,
+ size: int = MISSING,
+ format: ValidAssetFormatTypes = MISSING,
+ static_format: ValidStaticFormatTypes = MISSING,
) -> Asset:
"""Returns a new asset with the passed components replaced.
@@ -284,7 +286,7 @@ class Asset(AssetMixin):
url = yarl.URL(self._url)
path, _ = os.path.splitext(url.path)
- if format is not ...:
+ if format is not MISSING:
if self._animated:
if format not in VALID_ASSET_FORMATS:
raise InvalidArgument(f'format must be one of {VALID_ASSET_FORMATS}')
@@ -293,12 +295,12 @@ class Asset(AssetMixin):
raise InvalidArgument(f'format must be one of {VALID_STATIC_FORMATS}')
url = url.with_path(f'{path}.{format}')
- if static_format is not ... and not self._animated:
+ if static_format is not MISSING and not self._animated:
if static_format not in VALID_STATIC_FORMATS:
raise InvalidArgument(f'static_format must be one of {VALID_STATIC_FORMATS}')
url = url.with_path(f'{path}.{static_format}')
- if size is not ...:
+ if size is not MISSING:
if not utils.valid_icon_size(size):
raise InvalidArgument('size must be a power of 2 between 16 and 4096')
url = url.with_query(size=size)
diff --git a/discord/webhook/async_.py b/discord/webhook/async_.py
index 99a9cc481..8daa62ca1 100644
--- a/discord/webhook/async_.py
+++ b/discord/webhook/async_.py
@@ -1179,7 +1179,7 @@ class Webhook(BaseWebhook):
previous_mentions: Optional[AllowedMentions] = getattr(self._state, 'allowed_mentions', None)
if content is None:
- content = ... # type: ignore
+ content = MISSING
params = handle_message_parameters(
content=content,
diff --git a/discord/webhook/sync.py b/discord/webhook/sync.py
index 269782996..635633fd1 100644
--- a/discord/webhook/sync.py
+++ b/discord/webhook/sync.py
@@ -853,7 +853,7 @@ class SyncWebhook(BaseWebhook):
previous_mentions: Optional[AllowedMentions] = getattr(self._state, 'allowed_mentions', None)
if content is None:
- content = ... # type: ignore
+ content = MISSING
params = handle_message_parameters(
content=content,