fix lint

Author: yinghsienwu

google/auth/aio/transport/aiohttp.py

@@ -16,8 +16,7 @@
 
 import asyncio
 import logging
-import typing
-from typing import Any, AsyncGenerator, Mapping, Optional, Union
+from typing import Any, AsyncGenerator, Mapping, Optional, TYPE_CHECKING, Union
 
 try:
     import aiohttp  # type: ignore
@@ -26,7 +25,12 @@
         "The aiohttp library is not installed from please install the aiohttp package to use the aiohttp transport."
     ) from caught_exc
 
-if typing.TYPE_CHECKING:
+from google.auth import _helpers
+from google.auth import exceptions
+from google.auth.aio import _helpers as _helpers_async
+from google.auth.aio import transport
+
+if TYPE_CHECKING:  # pragma: NO COVER
     from aiohttp import ClientTimeout  # type: ignore
 
 else:
@@ -36,11 +40,6 @@
     except ImportError:
         ClientTimeout = None
 
-from google.auth import _helpers
-from google.auth import exceptions
-from google.auth.aio import _helpers as _helpers_async
-from google.auth.aio import transport
-
 _LOGGER = logging.getLogger(__name__)
 
 

google/auth/aio/transport/sessions.py

@@ -16,22 +16,14 @@
 from contextlib import asynccontextmanager
 import functools
 import time
-import typing
-from typing import Any, Mapping, Optional, Union
+from typing import Any, Mapping, Optional, TYPE_CHECKING, Union
 
 from google.auth import _exponential_backoff, exceptions
 from google.auth.aio import transport
 from google.auth.aio.credentials import Credentials
 from google.auth.exceptions import TimeoutError
 
-try:
-    from google.auth.aio.transport.aiohttp import Request as AiohttpRequest
-
-    AIOHTTP_INSTALLED = True
-except ImportError:  # pragma: NO COVER
-    AIOHTTP_INSTALLED = False
-
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:  # pragma: NO COVER
     from aiohttp import ClientTimeout  # type: ignore
 
 else:
@@ -41,6 +33,13 @@
     except ImportError:
         ClientTimeout = None
 
+try:
+    from google.auth.aio.transport.aiohttp import Request as AiohttpRequest
+
+    AIOHTTP_INSTALLED = True
+except ImportError:  # pragma: NO COVER
+    AIOHTTP_INSTALLED = False
+
 
 @asynccontextmanager
 async def timeout_guard(timeout):
@@ -221,14 +220,14 @@ async def get(
                 url (str): The URI to be requested.
                 data (Optional[bytes]): The payload or body in HTTP request.
                 headers (Optional[Mapping[str, str]]): Request headers.
-                timeout (float, aiohttp.ClientTimeout):
-                The amount of time in seconds to wait for the server response
-                with each individual request.
                 max_allowed_time (float):
                 If the method runs longer than this, a ``Timeout`` exception is
                 automatically raised. Unlike the ``timeout`` parameter, this
                 value applies to the total method execution time, even if
                 multiple requests are made under the hood.
+                timeout (float, aiohttp.ClientTimeout):
+                The amount of time in seconds to wait for the server response
+                with each individual request.
                 total_attempts (int):
                 The total number of retry attempts.
 
@@ -274,14 +273,14 @@ async def post(
                 url (str): The URI to be requested.
                 data (Optional[bytes]): The payload or body in HTTP request.
                 headers (Optional[Mapping[str, str]]): Request headers.
-                timeout (float, aiohttp.ClientTimeout):
-                The amount of time in seconds to wait for the server response
-                with each individual request.
                 max_allowed_time (float):
                 If the method runs longer than this, a ``Timeout`` exception is
                 automatically raised. Unlike the ``timeout`` parameter, this
                 value applies to the total method execution time, even if
                 multiple requests are made under the hood.
+                timeout (float, aiohttp.ClientTimeout):
+                The amount of time in seconds to wait for the server response
+                with each individual request.
                 total_attempts (int):
                 The total number of retry attempts.
 
@@ -327,14 +326,14 @@ async def put(
                 url (str): The URI to be requested.
                 data (Optional[bytes]): The payload or body in HTTP request.
                 headers (Optional[Mapping[str, str]]): Request headers.
-                timeout (float, aiohttp.ClientTimeout):
-                The amount of time in seconds to wait for the server response
-                with each individual request.
                 max_allowed_time (float):
                 If the method runs longer than this, a ``Timeout`` exception is
                 automatically raised. Unlike the ``timeout`` parameter, this
                 value applies to the total method execution time, even if
                 multiple requests are made under the hood.
+                timeout (float, aiohttp.ClientTimeout):
+                The amount of time in seconds to wait for the server response
+                with each individual request.
                 total_attempts (int):
                 The total number of retry attempts.
 
@@ -380,14 +379,14 @@ async def patch(
                 url (str): The URI to be requested.
                 data (Optional[bytes]): The payload or body in HTTP request.
                 headers (Optional[Mapping[str, str]]): Request headers.
-                timeout (float, aiohttp.ClientTimeout):
-                The amount of time in seconds to wait for the server response
-                with each individual request.
                 max_allowed_time (float):
                 If the method runs longer than this, a ``Timeout`` exception is
                 automatically raised. Unlike the ``timeout`` parameter, this
                 value applies to the total method execution time, even if
                 multiple requests are made under the hood.
+                timeout (float, aiohttp.ClientTimeout):
+                The amount of time in seconds to wait for the server response
+                with each individual request.
                 total_attempts (int):
                 The total number of retry attempts.
 
@@ -433,14 +432,14 @@ async def delete(
                 url (str): The URI to be requested.
                 data (Optional[bytes]): The payload or body in HTTP request.
                 headers (Optional[Mapping[str, str]]): Request headers.
-                timeout (float, aiohttp.ClientTimeout):
-                The amount of time in seconds to wait for the server response
-                with each individual request.
                 max_allowed_time (float):
                 If the method runs longer than this, a ``Timeout`` exception is
                 automatically raised. Unlike the ``timeout`` parameter, this
                 value applies to the total method execution time, even if
                 multiple requests are made under the hood.
+                timeout (float, aiohttp.ClientTimeout):
+                The amount of time in seconds to wait for the server response
+                with each individual request.
                 total_attempts (int):
                 The total number of retry attempts.