Merge pull request #95 from nekokatt/task/upgrade-black

Upgraded and baselined to black v20.8b1, which causes several major reformats.

hikari/api/cache.py

@@ -266,7 +266,10 @@ def get_invites_view_for_guild(
 
     @abc.abstractmethod
     def get_invites_view_for_channel(
-        self, guild_id: snowflakes.Snowflake, channel_id: snowflakes.Snowflake, /,
+        self,
+        guild_id: snowflakes.Snowflake,
+        channel_id: snowflakes.Snowflake,
+        /,
     ) -> CacheView[str, invites.InviteWithMetadata]:
         """Get a view of the invite objects in the cache for a specified channel.
 
@@ -1548,7 +1551,9 @@ def clear_voice_states_for_guild(
 
     @abc.abstractmethod
     def clear_voice_states_for_channel(
-        self, guild_id: snowflakes.Snowflake, channel_id: snowflakes.Snowflake,
+        self,
+        guild_id: snowflakes.Snowflake,
+        channel_id: snowflakes.Snowflake,
     ) -> CacheView[snowflakes.Snowflake, voices.VoiceState]:
         """Remove the voice state objects cached for a specific channel.
 

hikari/api/entity_factory.py

@@ -642,7 +642,10 @@ def deserialize_member(
 
     @abc.abstractmethod
     def deserialize_role(
-        self, payload: data_binding.JSONObject, *, guild_id: snowflakes.Snowflake,
+        self,
+        payload: data_binding.JSONObject,
+        *,
+        guild_id: snowflakes.Snowflake,
     ) -> guild_models.Role:
         """Parse a raw payload from Discord into a role object.
 

hikari/api/event_dispatcher.py

@@ -207,7 +207,10 @@ async def on_message(event):
 
     @abc.abstractmethod
     def get_listeners(
-        self, event_type: typing.Type[EventT_co], *, polymorphic: bool = True,
+        self,
+        event_type: typing.Type[EventT_co],
+        *,
+        polymorphic: bool = True,
     ) -> typing.Collection[CallbackT[EventT_co]]:
         """Get the listeners for a given event type, if there are any.
 
@@ -237,7 +240,8 @@ def get_listeners(
 
     @abc.abstractmethod
     def listen(
-        self, event_type: typing.Optional[typing.Type[EventT_co]] = None,
+        self,
+        event_type: typing.Optional[typing.Type[EventT_co]] = None,
     ) -> typing.Callable[[CallbackT[EventT_co]], CallbackT[EventT_co]]:
         """Generate a decorator to subscribe a callback to an event type.
 

hikari/api/event_factory.py

@@ -622,7 +622,9 @@ def deserialize_message_reaction_remove_emoji_event(
     ################
 
     def deserialize_ready_event(
-        self, shard: gateway_shard.GatewayShard, payload: data_binding.JSONObject,
+        self,
+        shard: gateway_shard.GatewayShard,
+        payload: data_binding.JSONObject,
     ) -> shard_events.ShardReadyEvent:
         """Parse a raw payload from Discord into a ready event object.
 

hikari/api/rest.py

@@ -1098,13 +1098,15 @@ async def fetch_webhook(
 
     @abc.abstractmethod
     async def fetch_channel_webhooks(
-        self, channel: snowflakes.SnowflakeishOr[channels.TextChannel],
+        self,
+        channel: snowflakes.SnowflakeishOr[channels.TextChannel],
     ) -> typing.Sequence[webhooks.Webhook]:
         ...
 
     @abc.abstractmethod
     async def fetch_guild_webhooks(
-        self, guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
+        self,
+        guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
     ) -> typing.Sequence[webhooks.Webhook]:
         ...
 
@@ -1437,7 +1439,9 @@ async def reposition_channels(
 
     @abc.abstractmethod
     async def fetch_member(
-        self, guild: snowflakes.SnowflakeishOr[guilds.PartialGuild], user: snowflakes.SnowflakeishOr[users.PartialUser],
+        self,
+        guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
+        user: snowflakes.SnowflakeishOr[users.PartialUser],
     ) -> guilds.Member:
         ...
 
@@ -1540,18 +1544,24 @@ async def unban_user(
 
     @abc.abstractmethod
     async def fetch_ban(
-        self, guild: snowflakes.SnowflakeishOr[guilds.PartialGuild], user: snowflakes.SnowflakeishOr[users.PartialUser],
+        self,
+        guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
+        user: snowflakes.SnowflakeishOr[users.PartialUser],
     ) -> guilds.GuildMemberBan:
         ...
 
     @abc.abstractmethod
     async def fetch_bans(
-        self, guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
+        self,
+        guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
     ) -> typing.Sequence[guilds.GuildMemberBan]:
         ...
 
     @abc.abstractmethod
-    async def fetch_roles(self, guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],) -> typing.Sequence[guilds.Role]:
+    async def fetch_roles(
+        self,
+        guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
+    ) -> typing.Sequence[guilds.Role]:
         ...
 
     @abc.abstractmethod
@@ -1699,19 +1709,22 @@ async def begin_guild_prune(
 
     @abc.abstractmethod
     async def fetch_guild_voice_regions(
-        self, guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
+        self,
+        guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
     ) -> typing.Sequence[voices.VoiceRegion]:
         ...
 
     @abc.abstractmethod
     async def fetch_guild_invites(
-        self, guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
+        self,
+        guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
     ) -> typing.Sequence[invites.InviteWithMetadata]:
         ...
 
     @abc.abstractmethod
     async def fetch_integrations(
-        self, guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
+        self,
+        guild: snowflakes.SnowflakeishOr[guilds.PartialGuild],
     ) -> typing.Sequence[guilds.Integration]:
         ...
 

hikari/applications.py

@@ -360,7 +360,11 @@ def format_icon(self, *, ext: str = "png", size: int = 4096) -> typing.Optional[
             return None
 
         return routes.CDN_TEAM_ICON.compile_to_file(
-            constants.CDN_URL, team_id=self.id, hash=self.icon_hash, size=size, file_format=ext,
+            constants.CDN_URL,
+            team_id=self.id,
+            hash=self.icon_hash,
+            size=size,
+            file_format=ext,
         )
 
 
@@ -373,7 +377,9 @@ class Application(snowflakes.Unique):
     """The client application that models may use for procedures."""
 
     id: snowflakes.Snowflake = attr.ib(
-        eq=True, hash=True, repr=True,
+        eq=True,
+        hash=True,
+        repr=True,
     )
     """The ID of this entity."""
 
@@ -480,7 +486,11 @@ def format_icon(self, *, ext: str = "png", size: int = 4096) -> typing.Optional[
             return None
 
         return routes.CDN_APPLICATION_ICON.compile_to_file(
-            constants.CDN_URL, application_id=self.id, hash=self.icon_hash, size=size, file_format=ext,
+            constants.CDN_URL,
+            application_id=self.id,
+            hash=self.icon_hash,
+            size=size,
+            file_format=ext,
         )
 
     @property
@@ -521,5 +531,9 @@ def format_cover_image(self, *, ext: str = "png", size: int = 4096) -> typing.Op
             return None
 
         return routes.CDN_APPLICATION_COVER.compile_to_file(
-            constants.CDN_URL, application_id=self.id, hash=self.cover_image_hash, size=size, file_format=ext,
+            constants.CDN_URL,
+            application_id=self.id,
+            hash=self.cover_image_hash,
+            size=size,
+            file_format=ext,
         )

hikari/channels.py

@@ -139,15 +139,22 @@ class PermissionOverwrite(snowflakes.Unique):
     """
 
     id: snowflakes.Snowflake = attr.ib(
-        converter=snowflakes.Snowflake, eq=True, hash=True, repr=True,
+        converter=snowflakes.Snowflake,
+        eq=True,
+        hash=True,
+        repr=True,
     )
     """The ID of this entity."""
 
     type: PermissionOverwriteType = attr.ib(converter=PermissionOverwriteType, eq=True, hash=True, repr=True)
     """The type of entity this overwrite targets."""
 
     allow: permissions.Permissions = attr.ib(
-        converter=permissions.Permissions, default=permissions.Permissions.NONE, eq=False, hash=False, repr=False,
+        converter=permissions.Permissions,
+        default=permissions.Permissions.NONE,
+        eq=False,
+        hash=False,
+        repr=False,
     )
     """The permissions this overwrite allows."""
 
@@ -481,7 +488,11 @@ def format_icon(self, *, ext: str = "png", size: int = 4096) -> typing.Optional[
             return None
 
         return routes.CDN_CHANNEL_ICON.compile_to_file(
-            constants.CDN_URL, channel_id=self.id, hash=self.icon_hash, size=size, file_format=ext,
+            constants.CDN_URL,
+            channel_id=self.id,
+            hash=self.icon_hash,
+            size=size,
+            file_format=ext,
         )
 
 

hikari/embeds.py

@@ -76,7 +76,10 @@ def filename(self) -> str:
         return self.resource.filename
 
     def stream(
-        self, *, executor: typing.Optional[concurrent.futures.Executor] = None, head_only: bool = False,
+        self,
+        *,
+        executor: typing.Optional[concurrent.futures.Executor] = None,
+        head_only: bool = False,
     ) -> files.AsyncReaderContextManager[AsyncReaderT]:
         """Produce a stream of data for the resource.
 
@@ -525,7 +528,9 @@ def __warn_naive_datetime() -> None:
         )
 
         warnings.warn(
-            message, category=errors.HikariWarning, stacklevel=3,
+            message,
+            category=errors.HikariWarning,
+            stacklevel=3,
         )
 
     @property

hikari/files.py

@@ -426,7 +426,10 @@ def extension(self) -> typing.Optional[str]:
 
     @abc.abstractmethod
     def stream(
-        self, *, executor: typing.Optional[concurrent.futures.Executor] = None, head_only: bool = False,
+        self,
+        *,
+        executor: typing.Optional[concurrent.futures.Executor] = None,
+        head_only: bool = False,
     ) -> AsyncReaderContextManager[ReaderImplT]:
         """Produce a stream of data for the resource.
 
@@ -594,7 +597,10 @@ class WebResource(Resource[WebReader], abc.ABC):
     __slots__: typing.Sequence[str] = ()
 
     def stream(
-        self, *, executor: typing.Optional[concurrent.futures.Executor] = None, head_only: bool = False,
+        self,
+        *,
+        executor: typing.Optional[concurrent.futures.Executor] = None,
+        head_only: bool = False,
     ) -> AsyncReaderContextManager[WebReader]:
         """Start streaming the content into memory by downloading it.
 
@@ -834,7 +840,10 @@ def filename(self) -> str:
         return self._filename
 
     def stream(
-        self, *, executor: typing.Optional[concurrent.futures.Executor] = None, head_only: bool = False,
+        self,
+        *,
+        executor: typing.Optional[concurrent.futures.Executor] = None,
+        head_only: bool = False,
     ) -> AsyncReaderContextManager[FileReader]:
         """Start streaming the resource using a thread pool executor.
 
@@ -961,7 +970,11 @@ class Bytes(Resource[IteratorReader]):
     """The provided mimetype, if specified. Otherwise `builtins.None`."""
 
     def __init__(
-        self, data: typing.Union[Rawish, LazyByteIteratorish], filename: str, /, mimetype: typing.Optional[str] = None,
+        self,
+        data: typing.Union[Rawish, LazyByteIteratorish],
+        filename: str,
+        /,
+        mimetype: typing.Optional[str] = None,
     ) -> None:
         if isinstance(data, RAWISH_TYPES):
             data = unwrap_bytes(data)
@@ -987,7 +1000,10 @@ def filename(self) -> str:
         return self._filename
 
     def stream(
-        self, *, executor: typing.Optional[concurrent.futures.Executor] = None, head_only: bool = False,
+        self,
+        *,
+        executor: typing.Optional[concurrent.futures.Executor] = None,
+        head_only: bool = False,
     ) -> AsyncReaderContextManager[IteratorReader]:
         """Start streaming the content in chunks.