mirror
/
Rapptz.discord.py
mirror of https://github.com/Rapptz/discord.py
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

linter

pull/10214/head
makerze 4 weeks ago
parent
4d058136fc
commit
89961e52fa
2 changed files with 27 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      discord/guild.py
  2. 25
      discord/role.py

54
discord/guild.py
View File

@ -1293,8 +1293,7 @@ class Guild(Hashable):
overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
category: Optional[Snowflake] = ..., category: Optional[Snowflake] = ...,
**options: Any, **options: Any,
) -> Coroutine[Any, Any, TextChannelPayload]: ) -> Coroutine[Any, Any, TextChannelPayload]: ...
...
@overload @overload
def _create_channel( def _create_channel(
@ -1304,8 +1303,7 @@ class Guild(Hashable):
overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
category: Optional[Snowflake] = ..., category: Optional[Snowflake] = ...,
**options: Any, **options: Any,
) -> Coroutine[Any, Any, VoiceChannelPayload]: ) -> Coroutine[Any, Any, VoiceChannelPayload]: ...
...
@overload @overload
def _create_channel( def _create_channel(
@ -1315,8 +1313,7 @@ class Guild(Hashable):
overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
category: Optional[Snowflake] = ..., category: Optional[Snowflake] = ...,
**options: Any, **options: Any,
) -> Coroutine[Any, Any, StageChannelPayload]: ) -> Coroutine[Any, Any, StageChannelPayload]: ...
...
@overload @overload
def _create_channel( def _create_channel(
@ -1326,8 +1323,7 @@ class Guild(Hashable):
overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
category: Optional[Snowflake] = ..., category: Optional[Snowflake] = ...,
**options: Any, **options: Any,
) -> Coroutine[Any, Any, CategoryChannelPayload]: ) -> Coroutine[Any, Any, CategoryChannelPayload]: ...
...
@overload @overload
def _create_channel( def _create_channel(
@ -1337,8 +1333,7 @@ class Guild(Hashable):
overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
category: Optional[Snowflake] = ..., category: Optional[Snowflake] = ...,
**options: Any, **options: Any,
) -> Coroutine[Any, Any, NewsChannelPayload]: ) -> Coroutine[Any, Any, NewsChannelPayload]: ...
...
@overload @overload
def _create_channel( def _create_channel(
@ -1348,8 +1343,7 @@ class Guild(Hashable):
overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
category: Optional[Snowflake] = ..., category: Optional[Snowflake] = ...,
**options: Any, **options: Any,
) -> Coroutine[Any, Any, Union[TextChannelPayload, NewsChannelPayload]]: ) -> Coroutine[Any, Any, Union[TextChannelPayload, NewsChannelPayload]]: ...
...
@overload @overload
def _create_channel( def _create_channel(
@ -1359,8 +1353,7 @@ class Guild(Hashable):
overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
category: Optional[Snowflake] = ..., category: Optional[Snowflake] = ...,
**options: Any, **options: Any,
) -> Coroutine[Any, Any, ForumChannelPayload]: ) -> Coroutine[Any, Any, ForumChannelPayload]: ...
...
@overload @overload
def _create_channel( def _create_channel(
@ -1370,8 +1363,7 @@ class Guild(Hashable):
overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ..., overwrites: Mapping[Union[Role, Member, Object], PermissionOverwrite] = ...,
category: Optional[Snowflake] = ..., category: Optional[Snowflake] = ...,
**options: Any, **options: Any,
) -> Coroutine[Any, Any, GuildChannelPayload]: ) -> Coroutine[Any, Any, GuildChannelPayload]: ...
...
def _create_channel( def _create_channel(
self, self,
@ -3202,8 +3194,7 @@ class Guild(Hashable):
description: str = ..., description: str = ...,
image: bytes = ..., image: bytes = ...,
reason: Optional[str] = ..., reason: Optional[str] = ...,
) -> ScheduledEvent: ) -> ScheduledEvent: ...
...
@overload @overload
async def create_scheduled_event( async def create_scheduled_event(
@ -3218,8 +3209,7 @@ class Guild(Hashable):
description: str = ..., description: str = ...,
image: bytes = ..., image: bytes = ...,
reason: Optional[str] = ..., reason: Optional[str] = ...,
) -> ScheduledEvent: ) -> ScheduledEvent: ...
...
@overload @overload
async def create_scheduled_event( async def create_scheduled_event(
@ -3233,8 +3223,7 @@ class Guild(Hashable):
description: str = ..., description: str = ...,
image: bytes = ..., image: bytes = ...,
reason: Optional[str] = ..., reason: Optional[str] = ...,
) -> ScheduledEvent: ) -> ScheduledEvent: ...
...
@overload @overload
async def create_scheduled_event( async def create_scheduled_event(
@ -3248,8 +3237,7 @@ class Guild(Hashable):
description: str = ..., description: str = ...,
image: bytes = ..., image: bytes = ...,
reason: Optional[str] = ..., reason: Optional[str] = ...,
) -> ScheduledEvent: ) -> ScheduledEvent: ...
...
async def create_scheduled_event( async def create_scheduled_event(
self, self,
@ -3617,8 +3605,7 @@ class Guild(Hashable):
primary_color: Union[Colour, int, None] = ..., primary_color: Union[Colour, int, None] = ...,
secondary_color: Union[Colour, int, None] = ..., secondary_color: Union[Colour, int, None] = ...,
tertiary_color: Union[Colour, int, None] = ..., tertiary_color: Union[Colour, int, None] = ...,
) -> Role: ) -> Role: ...
...
@overload @overload
async def create_role( async def create_role(
@ -3634,8 +3621,7 @@ class Guild(Hashable):
primary_color: Union[Colour, int, None] = ..., primary_color: Union[Colour, int, None] = ...,
secondary_color: Union[Colour, int, None] = ..., secondary_color: Union[Colour, int, None] = ...,
tertiary_color: Union[Colour, int, None] = ..., tertiary_color: Union[Colour, int, None] = ...,
) -> Role: ) -> Role: ...
...
async def create_role( async def create_role(
self, self,
@ -3728,17 +3714,13 @@ class Guild(Hashable):
fields['color'] = actual_colour.value fields['color'] = actual_colour.value
solid_color_used = color is not MISSING or colour is not MISSING solid_color_used = color is not MISSING or colour is not MISSING
colors_used = ( colors_used = primary_color is not MISSING or secondary_color is not MISSING or tertiary_color is not MISSING
primary_color is not MISSING or
secondary_color is not MISSING or
tertiary_color is not MISSING
)
if solid_color_used and colors_used: if solid_color_used and colors_used:
raise TypeError( raise TypeError(
"You must choose either only solid color (color/colour) or colors (primary_color/secondary_color/tertiary_color), not both." "You must choose either only solid color (color/colour) or colors (primary_color/secondary_color/tertiary_color), not both."
) )
colors_payload: Dict[str, Any]= {} colors_payload: Dict[str, Any] = {}
if primary_color is not MISSING: if primary_color is not MISSING:
if primary_color is None: if primary_color is None:
colors_payload['primary_color'] = None colors_payload['primary_color'] = None
@ -3763,7 +3745,7 @@ class Guild(Hashable):
if colors_payload: if colors_payload:
fields['colors'] = colors_payload fields['colors'] = colors_payload
if not colors_payload: if not colors_payload:
actual_colour = colour or color or Colour.default() actual_colour = colour or color or Colour.default()
if isinstance(actual_colour, int): if isinstance(actual_colour, int):

25
discord/role.py
View File

@ -224,7 +224,7 @@ class Role(Hashable):
'_state', '_state',
'_primary_color', '_primary_color',
'_secondary_color', '_secondary_color',
'_tertiary_color', '_tertiary_color',
) )
def __init__(self, *, guild: Guild, state: ConnectionState, data: RolePayload): def __init__(self, *, guild: Guild, state: ConnectionState, data: RolePayload):
@ -344,6 +344,7 @@ class Role(Hashable):
def tertiary_color(self) -> Optional[Colour]: def tertiary_color(self) -> Optional[Colour]:
"""Optional[:class:`Colour`]: The role's tertiary color.""" """Optional[:class:`Colour`]: The role's tertiary color."""
return Colour(self._tertiary_color) if self._tertiary_color is not None else None return Colour(self._tertiary_color) if self._tertiary_color is not None else None
@property @property
def permissions(self) -> Permissions: def permissions(self) -> Permissions:
""":class:`Permissions`: Returns the role's permissions.""" """:class:`Permissions`: Returns the role's permissions."""
@ -552,16 +553,12 @@ class Role(Hashable):
payload['mentionable'] = mentionable payload['mentionable'] = mentionable
solid_color_used = color is not MISSING or colour is not MISSING solid_color_used = color is not MISSING or colour is not MISSING
colors_used = ( colors_used = primary_color is not MISSING or secondary_color is not MISSING or tertiary_color is not MISSING
primary_color is not MISSING or
secondary_color is not MISSING or
tertiary_color is not MISSING
)
if solid_color_used and colors_used: if solid_color_used and colors_used:
raise TypeError( raise TypeError(
"You must choose either only solid color (color/colour) or colors (primary_color/secondary_color/tertiary_color), not both." "You must choose either only solid color (color/colour) or colors (primary_color/secondary_color/tertiary_color), not both."
) )
colors_payload: Dict[str, Any] = {} colors_payload: Dict[str, Any] = {}
if primary_color is not MISSING: if primary_color is not MISSING:
if primary_color is None: if primary_color is None:
@ -586,25 +583,21 @@ class Role(Hashable):
colors_payload['tertiary_color'] = tertiary_color.value colors_payload['tertiary_color'] = tertiary_color.value
if colors_payload: if colors_payload:
payload['colors'] = colors_payload payload['colors'] = colors_payload
data = await self._state.http.edit_role(self.guild.id, self.id, reason=reason, **payload) data = await self._state.http.edit_role(self.guild.id, self.id, reason=reason, **payload)
return Role(guild=self.guild, data=data, state=self._state) return Role(guild=self.guild, data=data, state=self._state)
@overload @overload
async def move(self, *, beginning: bool, offset: int = ..., reason: Optional[str] = ...): async def move(self, *, beginning: bool, offset: int = ..., reason: Optional[str] = ...): ...
...
@overload @overload
async def move(self, *, end: bool, offset: int = ..., reason: Optional[str] = ...): async def move(self, *, end: bool, offset: int = ..., reason: Optional[str] = ...): ...
...
@overload @overload
async def move(self, *, above: Role, offset: int = ..., reason: Optional[str] = ...): async def move(self, *, above: Role, offset: int = ..., reason: Optional[str] = ...): ...
...
@overload @overload
async def move(self, *, below: Role, offset: int = ..., reason: Optional[str] = ...): async def move(self, *, below: Role, offset: int = ..., reason: Optional[str] = ...): ...
...
async def move( async def move(
self, self,

Write Preview
Loading…
Cancel
Save