Refactor type annotations for clarity and consistency

vadim-su · Nov 16, 2024 · 89b26cd · 89b26cd
1 parent ee59b7d
commit 89b26cd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/asyncord/client/messages/models/requests/base_message.py b/asyncord/client/messages/models/requests/base_message.py
@@ -205,7 +205,7 @@ def validate_components(
     @classmethod
     def inject_embed_attachments(
         cls,
-        attachments: ListAttachmentType | SingleAttachmentType | None | Any,  # noqa: ANN401
+        attachments: ListAttachmentType | SingleAttachmentType | Any | None,  # noqa: ANN401
         info: ValidationInfo,
     ) -> list[Any] | None:
         """Inject embed attachments into the data.

diff --git a/asyncord/client/rest.py b/asyncord/client/rest.py
@@ -34,7 +34,7 @@ class RestClient:
     def __init__(
         self,
         auth: str | AuthStrategy | None,
-        ratelimit_strategy: RateLimitStrategy | None | UnsetType = Unset,
+        ratelimit_strategy: RateLimitStrategy | UnsetType | None = Unset,
         session: aiohttp.ClientSession | None = None,
         http_client: HttpClient | None = None,
     ) -> None:
@@ -102,7 +102,7 @@ def _init_auth_strategy(self, auth: str | AuthStrategy | None) -> None:
 
     def _init_ratelimit_strategy(
         self,
-        ratelimit_strategy: RateLimitStrategy | None | UnsetType = Unset,
+        ratelimit_strategy: RateLimitStrategy | UnsetType | None = Unset,
     ) -> None:
         """Initialize the rate limit strategy.
 

diff --git a/asyncord/client_hub.py b/asyncord/client_hub.py
@@ -67,7 +67,7 @@ def create_client_group(
         self,
         group_name: str,
         auth: str | AuthStrategy | None = None,
-        ratelimit_strategy: RateLimitStrategy | None | UnsetType = Unset,
+        ratelimit_strategy: RateLimitStrategy | UnsetType | None = Unset,
         dispatcher: EventDispatcher | None = None,
         http_client: HttpClient | None = None,
     ) -> ClientGroup:
@@ -145,7 +145,7 @@ def _build_client_group(
         self,
         group_name: str,
         auth: str | AuthStrategy | None,
-        ratelimit_strategy: RateLimitStrategy | None | UnsetType,
+        ratelimit_strategy: RateLimitStrategy | UnsetType | None,
         session: aiohttp.ClientSession | None,
         dispatcher: EventDispatcher | None,
         http_client: HttpClient | None,
@@ -248,7 +248,7 @@ async def close(self) -> None:
 @asynccontextmanager
 async def connect(
     auth: str | AuthStrategy | None = None,
-    ratelimit_strategy: RateLimitStrategy | None | UnsetType = Unset,
+    ratelimit_strategy: RateLimitStrategy | UnsetType | None = Unset,
     session: aiohttp.ClientSession | None = None,
     dispatcher: EventDispatcher | None = None,
     http_client: HttpClient | None = None,

diff --git a/tests/gateway/test_client.py b/tests/gateway/test_client.py
@@ -34,11 +34,11 @@
 def test_init(  # noqa: PLR0917, PLR0913
     token: BotTokenAuthStrategy | Literal['token'],
     session: aiohttp.ClientSession,
-    conn_data: None | ConnectionData,
+    conn_data: ConnectionData | None,
     intents: Intent,
     heartbeat_class: type[Heartbeat] | HeartbeatFactory | None,
-    dispatcher: None | EventDispatcher,
-    name: None | Literal['TestClient'],
+    dispatcher: EventDispatcher | None,
+    name: Literal['TestClient'] | None,
     mocker: MockFixture,
 ) -> None:
     """Test initializing the GatewayClient.