From 23799929b8c38dea73f91603cbf296ebd2b5f13d Mon Sep 17 00:00:00 2001
From: mpa <mpa@snejugal.ru>
Date: Wed, 22 Apr 2020 10:00:59 +0400
Subject: [PATCH] style(mypy): apply linter changes

---
 aiogram/api/client/bot.py                        |  7 +++++--
 aiogram/api/client/session/aiohttp.py            | 16 +++++++++-------
 aiogram/api/client/session/base.py               |  4 ++--
 .../test_session/test_aiohttp_session.py         | 12 ++++++++----
 .../test_session/test_base_session.py            |  4 ++--
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/aiogram/api/client/bot.py b/aiogram/api/client/bot.py
index 47fde6fc..051f1fd5 100644
--- a/aiogram/api/client/bot.py
+++ b/aiogram/api/client/bot.py
@@ -110,7 +110,7 @@ from ..types import (
     WebhookInfo,
 )
 from .session.aiohttp import AiohttpSession
-from .session.base import BaseSession, PT
+from .session.base import PT, BaseSession
 
 T = TypeVar("T")
 
@@ -121,7 +121,10 @@ class Bot(ContextInstanceMixin["Bot"]):
     """
 
     def __init__(
-        self, token: str, session: Optional[BaseSession[PT]] = None, parse_mode: Optional[str] = None
+        self,
+        token: str,
+        session: Optional[BaseSession[PT]] = None,
+        parse_mode: Optional[str] = None,
     ) -> None:
         validate_token(token)
 
diff --git a/aiogram/api/client/session/aiohttp.py b/aiogram/api/client/session/aiohttp.py
index fdc59a7a..a41a7b45 100644
--- a/aiogram/api/client/session/aiohttp.py
+++ b/aiogram/api/client/session/aiohttp.py
@@ -4,18 +4,18 @@ from typing import (
     Any,
     AsyncGenerator,
     Callable,
-    Optional,
-    Iterable,
-    TypeVar,
-    Type,
-    Tuple,
     Dict,
+    Iterable,
     List,
+    Optional,
+    Tuple,
+    Type,
+    TypeVar,
     Union,
     cast,
 )
 
-from aiohttp import ClientSession, ClientTimeout, FormData, BasicAuth, TCPConnector
+from aiohttp import BasicAuth, ClientSession, ClientTimeout, FormData, TCPConnector
 
 from aiogram.api.methods import Request, TelegramMethod
 
@@ -60,8 +60,10 @@ def _prepare_connector(chain_or_plain: _ProxyType) -> Tuple[Type["TCPConnector"]
     if isinstance(chain_or_plain, str) or (
         isinstance(chain_or_plain, tuple) and len(chain_or_plain) == 2
     ):
+        chain_or_plain = cast(_ProxyBasic, chain_or_plain)
         return ProxyConnector, _retrieve_basic(chain_or_plain)
 
+    chain_or_plain = cast(_ProxyChain, chain_or_plain)
     infos: List[ProxyInfo] = []
     for basic in chain_or_plain:
         infos.append(ProxyInfo(**_retrieve_basic(basic)))
@@ -73,7 +75,7 @@ class AiohttpSession(BaseSession[_ProxyType]):
     def __init__(
         self,
         api: TelegramAPIServer = PRODUCTION,
-        json_loads: Optional[Callable[[str, ...], Any]] = None,
+        json_loads: Optional[Callable[..., Any]] = None,
         json_dumps: Optional[Callable[..., str]] = None,
         proxy: Optional[_ProxyType] = None,
     ):
diff --git a/aiogram/api/client/session/base.py b/aiogram/api/client/session/base.py
index 8b417a10..cd5dfaae 100644
--- a/aiogram/api/client/session/base.py
+++ b/aiogram/api/client/session/base.py
@@ -4,7 +4,7 @@ import abc
 import datetime
 import json
 from types import TracebackType
-from typing import Any, AsyncGenerator, Callable, Optional, Type, TypeVar, Union, Generic
+from typing import Any, AsyncGenerator, Callable, Generic, Optional, Type, TypeVar, Union
 
 from aiogram.utils.exceptions import TelegramAPIError
 
@@ -19,7 +19,7 @@ class BaseSession(abc.ABC, Generic[PT]):
     def __init__(
         self,
         api: Optional[TelegramAPIServer] = None,
-        json_loads: Optional[Callable[[str, ...], Any]] = None,
+        json_loads: Optional[Callable[..., Any]] = None,
         json_dumps: Optional[Callable[..., str]] = None,
         proxy: Optional[PT] = None,
     ) -> None:
diff --git a/tests/test_api/test_client/test_session/test_aiohttp_session.py b/tests/test_api/test_client/test_session/test_aiohttp_session.py
index 2658407f..3fe9e83e 100644
--- a/tests/test_api/test_client/test_session/test_aiohttp_session.py
+++ b/tests/test_api/test_client/test_session/test_aiohttp_session.py
@@ -61,8 +61,8 @@ class TestAiohttpSession:
         session = AiohttpSession(
             proxy=[
                 "socks4://proxy.url/",
-                'socks5://proxy.url/',
-                'http://user:password@127.0.0.1:3128'
+                "socks5://proxy.url/",
+                "http://user:password@127.0.0.1:3128",
             ]
         )
 
@@ -72,8 +72,12 @@ class TestAiohttpSession:
         assert isinstance(session._connector_init["proxy_infos"], list)
         assert isinstance(session._connector_init["proxy_infos"][0], aiohttp_socks.ProxyInfo)
 
-        assert session._connector_init["proxy_infos"][0].proxy_type is aiohttp_socks.ProxyType.SOCKS4
-        assert session._connector_init["proxy_infos"][1].proxy_type is aiohttp_socks.ProxyType.SOCKS5
+        assert (
+            session._connector_init["proxy_infos"][0].proxy_type is aiohttp_socks.ProxyType.SOCKS4
+        )
+        assert (
+            session._connector_init["proxy_infos"][1].proxy_type is aiohttp_socks.ProxyType.SOCKS5
+        )
         assert session._connector_init["proxy_infos"][2].proxy_type is aiohttp_socks.ProxyType.HTTP
 
         aiohttp_session = await session.create_session()
diff --git a/tests/test_api/test_client/test_session/test_base_session.py b/tests/test_api/test_client/test_session/test_base_session.py
index 29146ef4..ced54b63 100644
--- a/tests/test_api/test_client/test_session/test_base_session.py
+++ b/tests/test_api/test_client/test_session/test_base_session.py
@@ -1,6 +1,6 @@
-import types
 import datetime
-from typing import AsyncContextManager, AsyncGenerator, Any
+import types
+from typing import Any, AsyncContextManager, AsyncGenerator
 
 import pytest