From 630b2a1e550b7f0cfc8495ed0da70d3ef577bd50 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 2 Jul 2023 08:26:27 +1000 Subject: [PATCH] Update pyright version --- .github/workflows/lint.yml | 2 +- discord/abc.py | 2 ++ discord/app_commands/commands.py | 2 +- discord/app_commands/transformers.py | 3 +-- discord/app_commands/translator.py | 2 +- discord/channel.py | 2 +- discord/components.py | 2 +- discord/ext/commands/cog.py | 2 +- discord/ext/commands/context.py | 2 +- discord/ext/commands/core.py | 6 +++--- discord/ext/commands/flags.py | 4 ++-- discord/ext/commands/hybrid.py | 6 +++--- discord/ext/commands/parameters.py | 2 +- discord/flags.py | 18 ++++++++++++++++-- discord/guild.py | 11 +++++++---- discord/http.py | 3 +-- discord/invite.py | 3 ++- 17 files changed, 45 insertions(+), 27 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 436b5ccc0..b233a5def 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -38,7 +38,7 @@ jobs: - name: Run Pyright uses: jakebailey/pyright-action@v1 with: - version: '1.1.289' + version: '1.1.316' warnings: false no-comments: ${{ matrix.python-version != '3.x' }} diff --git a/discord/abc.py b/discord/abc.py index 242662d15..f93ca3a9a 100644 --- a/discord/abc.py +++ b/discord/abc.py @@ -1246,6 +1246,8 @@ class GuildChannel: :class:`~discord.Invite` The invite that was created. """ + if target_type is InviteTarget.unknown: + raise ValueError('Cannot create invite with an unknown target type') data = await self._state.http.create_invite( self.id, diff --git a/discord/app_commands/commands.py b/discord/app_commands/commands.py index 8e6693408..0766475ec 100644 --- a/discord/app_commands/commands.py +++ b/discord/app_commands/commands.py @@ -976,7 +976,7 @@ class Command(Generic[GroupT, P, T]): if self.binding is not None: check: Optional[Check] = getattr(self.binding, 'interaction_check', None) if check: - ret = await maybe_coroutine(check, interaction) # type: ignore # Probable pyright bug + ret = await maybe_coroutine(check, interaction) if not ret: return False diff --git a/discord/app_commands/transformers.py b/discord/app_commands/transformers.py index 8f009181b..dfdbefa23 100644 --- a/discord/app_commands/transformers.py +++ b/discord/app_commands/transformers.py @@ -177,8 +177,7 @@ class CommandParameter: return choice try: - # ParamSpec doesn't understand that transform is a callable since it's unbound - return await maybe_coroutine(self._annotation.transform, interaction, value) # type: ignore + return await maybe_coroutine(self._annotation.transform, interaction, value) except AppCommandError: raise except Exception as e: diff --git a/discord/app_commands/translator.py b/discord/app_commands/translator.py index 1741054e3..4b6e01d4b 100644 --- a/discord/app_commands/translator.py +++ b/discord/app_commands/translator.py @@ -109,7 +109,7 @@ class TranslationContext(Generic[_L, _D]): def __init__(self, location: Literal[TranslationContextLocation.other], data: Any) -> None: ... - def __init__(self, location: _L, data: _D) -> None: + def __init__(self, location: _L, data: _D) -> None: # type: ignore # pyright doesn't like the overloads self.location: _L = location self.data: _D = data diff --git a/discord/channel.py b/discord/channel.py index 8c212c0cb..208d85eb0 100644 --- a/discord/channel.py +++ b/discord/channel.py @@ -776,7 +776,7 @@ class TextChannel(discord.abc.Messageable, discord.abc.GuildChannel, Hashable): self.id, name=name, auto_archive_duration=auto_archive_duration or self.default_auto_archive_duration, - type=type.value, + type=type.value, # type: ignore # we're assuming that the user is passing a valid variant reason=reason, invitable=invitable, rate_limit_per_user=slowmode_delay, diff --git a/discord/components.py b/discord/components.py index 5c3679b13..6a8345801 100644 --- a/discord/components.py +++ b/discord/components.py @@ -279,7 +279,7 @@ class SelectMenu(Component): def to_dict(self) -> SelectMenuPayload: payload: SelectMenuPayload = { - 'type': self.type.value, + 'type': self.type.value, # type: ignore # we know this is a select menu. 'custom_id': self.custom_id, 'min_values': self.min_values, 'max_values': self.max_values, diff --git a/discord/ext/commands/cog.py b/discord/ext/commands/cog.py index 319f85b80..0e35021a1 100644 --- a/discord/ext/commands/cog.py +++ b/discord/ext/commands/cog.py @@ -377,7 +377,7 @@ class Cog(metaclass=CogMeta): if len(mapping) > 25: raise TypeError('maximum number of application command children exceeded') - self.__cog_app_commands_group__._children = mapping # type: ignore # Variance issue + self.__cog_app_commands_group__._children = mapping return self diff --git a/discord/ext/commands/context.py b/discord/ext/commands/context.py index 40ef48cf8..5fc675acd 100644 --- a/discord/ext/commands/context.py +++ b/discord/ext/commands/context.py @@ -251,7 +251,7 @@ class Context(discord.abc.Messageable, Generic[BotT]): if command is None: raise ValueError('interaction does not have command data') - bot: BotT = interaction.client # type: ignore + bot: BotT = interaction.client data: ApplicationCommandInteractionData = interaction.data # type: ignore if interaction.message is None: synthetic_payload = { diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py index ffbefe284..efd7b09d2 100644 --- a/discord/ext/commands/core.py +++ b/discord/ext/commands/core.py @@ -776,7 +776,7 @@ class Command(_BaseCommand, Generic[CogT, P, T]): command = self # command.parent is type-hinted as GroupMixin some attributes are resolved via MRO while command.parent is not None: # type: ignore - command = command.parent # type: ignore + command = command.parent entries.append(command.name) # type: ignore return ' '.join(reversed(entries)) @@ -794,7 +794,7 @@ class Command(_BaseCommand, Generic[CogT, P, T]): entries = [] command = self while command.parent is not None: # type: ignore - command = command.parent # type: ignore + command = command.parent entries.append(command) return entries @@ -2004,7 +2004,7 @@ def check_any(*checks: Check[ContextT]) -> Check[ContextT]: # if we're here, all checks failed raise CheckAnyFailure(unwrapped, errors) - return check(predicate) # type: ignore + return check(predicate) def has_role(item: Union[int, str], /) -> Check[Any]: diff --git a/discord/ext/commands/flags.py b/discord/ext/commands/flags.py index 423101852..280b65257 100644 --- a/discord/ext/commands/flags.py +++ b/discord/ext/commands/flags.py @@ -485,7 +485,7 @@ class FlagConverter(metaclass=FlagsMeta): for flag in flags.values(): if callable(flag.default): # Type checker does not understand that flag.default is a Callable - default = await maybe_coroutine(flag.default, ctx) # type: ignore + default = await maybe_coroutine(flag.default, ctx) setattr(self, flag.attribute, default) else: setattr(self, flag.attribute, flag.default) @@ -600,7 +600,7 @@ class FlagConverter(metaclass=FlagsMeta): else: if callable(flag.default): # Type checker does not understand flag.default is a Callable - default = await maybe_coroutine(flag.default, ctx) # type: ignore + default = await maybe_coroutine(flag.default, ctx) setattr(self, flag.attribute, default) else: setattr(self, flag.attribute, flag.default) diff --git a/discord/ext/commands/hybrid.py b/discord/ext/commands/hybrid.py index 41d9ffd25..eec964f1d 100644 --- a/discord/ext/commands/hybrid.py +++ b/discord/ext/commands/hybrid.py @@ -398,7 +398,7 @@ class HybridAppCommand(discord.app_commands.Command[CogT, P, T]): if self.binding is not None: try: # Type checker does not like runtime attribute retrieval - check: AppCommandCheck = self.binding.interaction_check # type: ignore + check: AppCommandCheck = self.binding.interaction_check except AttributeError: pass else: @@ -920,9 +920,9 @@ def hybrid_group( If the function is not a coroutine or is already a command. """ - def decorator(func: CommandCallback[CogT, ContextT, P, T]): + def decorator(func: CommandCallback[CogT, ContextT, P, T]) -> HybridGroup[CogT, P, T]: if isinstance(func, Command): raise TypeError('Callback is already a command.') return HybridGroup(func, name=name, with_app_command=with_app_command, **attrs) - return decorator # type: ignore + return decorator diff --git a/discord/ext/commands/parameters.py b/discord/ext/commands/parameters.py index d3302f5a3..181653bdc 100644 --- a/discord/ext/commands/parameters.py +++ b/discord/ext/commands/parameters.py @@ -197,7 +197,7 @@ class Parameter(inspect.Parameter): """ # pre-condition: required is False if callable(self.default): - return await maybe_coroutine(self.default, ctx) # type: ignore + return await maybe_coroutine(self.default, ctx) return self.default diff --git a/discord/flags.py b/discord/flags.py index 27eaf2628..001dcfce5 100644 --- a/discord/flags.py +++ b/discord/flags.py @@ -26,7 +26,21 @@ from __future__ import annotations from functools import reduce from operator import or_ -from typing import TYPE_CHECKING, Any, Callable, ClassVar, Dict, Iterator, List, Optional, Tuple, Type, TypeVar, overload +from typing import ( + TYPE_CHECKING, + Any, + Callable, + ClassVar, + Dict, + Iterator, + List, + Optional, + Sequence, + Tuple, + Type, + TypeVar, + overload, +) from .enums import UserFlags @@ -1621,7 +1635,7 @@ class ChannelFlags(BaseFlags): class ArrayFlags(BaseFlags): @classmethod - def _from_value(cls: Type[Self], value: List[int]) -> Self: + def _from_value(cls: Type[Self], value: Sequence[int]) -> Self: self = cls.__new__(cls) # This is a micro-optimization given the frequency this object can be created. # (1).__lshift__ is used in place of lambda x: 1 << x diff --git a/discord/guild.py b/discord/guild.py index f7d1a5566..33ad1871a 100644 --- a/discord/guild.py +++ b/discord/guild.py @@ -132,6 +132,7 @@ if TYPE_CHECKING: from .types.integration import IntegrationType from .types.snowflake import SnowflakeList from .types.widget import EditWidgetSettings + from .types.audit_log import AuditLogEvent from .message import EmojiInputType VocalGuildChannel = Union[VoiceChannel, StageChannel] @@ -3853,7 +3854,7 @@ class Guild(Hashable): async def _before_strategy(retrieve: int, before: Optional[Snowflake], limit: Optional[int]): before_id = before.id if before else None data = await self._state.http.get_audit_logs( - self.id, limit=retrieve, user_id=user_id, action_type=action, before=before_id + self.id, limit=retrieve, user_id=user_id, action_type=action_type, before=before_id ) entries = data.get('audit_log_entries', []) @@ -3869,7 +3870,7 @@ class Guild(Hashable): async def _after_strategy(retrieve: int, after: Optional[Snowflake], limit: Optional[int]): after_id = after.id if after else None data = await self._state.http.get_audit_logs( - self.id, limit=retrieve, user_id=user_id, action_type=action, after=after_id + self.id, limit=retrieve, user_id=user_id, action_type=action_type, after=after_id ) entries = data.get('audit_log_entries', []) @@ -3887,8 +3888,10 @@ class Guild(Hashable): else: user_id = None - if action: - action = action.value + if action is not MISSING: + action_type: Optional[AuditLogEvent] = action.value + else: + action_type = None if isinstance(before, datetime.datetime): before = Object(id=utils.time_snowflake(before, high=False)) diff --git a/discord/http.py b/discord/http.py index 6e803830e..84365cec7 100644 --- a/discord/http.py +++ b/discord/http.py @@ -68,7 +68,6 @@ if TYPE_CHECKING: from .embeds import Embed from .message import Attachment from .flags import MessageFlags - from .enums import AuditLogAction from .types import ( appinfo, @@ -1727,7 +1726,7 @@ class HTTPClient: before: Optional[Snowflake] = None, after: Optional[Snowflake] = None, user_id: Optional[Snowflake] = None, - action_type: Optional[AuditLogAction] = None, + action_type: Optional[audit_log.AuditLogEvent] = None, ) -> Response[audit_log.AuditLog]: params: Dict[str, Any] = {'limit': limit} if before: diff --git a/discord/invite.py b/discord/invite.py index 6e00f36e3..1c18e4187 100644 --- a/discord/invite.py +++ b/discord/invite.py @@ -47,6 +47,7 @@ if TYPE_CHECKING: InviteGuild as InviteGuildPayload, GatewayInvite as GatewayInvitePayload, ) + from .types.guild import GuildFeature from .types.channel import ( PartialChannel as InviteChannelPayload, ) @@ -189,7 +190,7 @@ class PartialInviteGuild: self._state: ConnectionState = state self.id: int = id self.name: str = data['name'] - self.features: List[str] = data.get('features', []) + self.features: List[GuildFeature] = data.get('features', []) self._icon: Optional[str] = data.get('icon') self._banner: Optional[str] = data.get('banner') self._splash: Optional[str] = data.get('splash')