Merge pull request #1146 from jakob-keller/remove-helpers-asynccontex…

…tmanager

Remove legacy `asynccontextmanager` import from `_helpers`

aiobotocore/_helpers.py

@@ -1,14 +1,5 @@
 import inspect
 
-try:
- from contextlib import ( # noqa: F401 lgtm[py/unused-import]
- asynccontextmanager,
- )
-except ImportError:
- from async_generator import ( # noqa: F401 E501, lgtm[py/unused-import]
- asynccontextmanager,
- )
-
 
 async def resolve_awaitable(obj):
  if inspect.isawaitable(obj):

aiobotocore/utils.py

@@ -1,4 +1,5 @@
 import asyncio
+import contextlib
 import functools
 import inspect
 import json
@@ -34,7 +35,6 @@
 )
 
 import aiobotocore.httpsession
-from aiobotocore._helpers import asynccontextmanager
 
 logger = logging.getLogger(__name__)
 
@@ -45,7 +45,7 @@ def __init__(self, *args, **kwargs):
  self.__ref_count = 0
  self.__lock = None
 
- @asynccontextmanager
+ @contextlib.asynccontextmanager
  async def acquire(self):
  if not self.__lock:
  self.__lock = asyncio.Lock()

tests/boto_tests/helpers.py

@@ -1,9 +1,8 @@
-from contextlib import AsyncExitStack
+from contextlib import AsyncExitStack, asynccontextmanager
 
 from botocore.stub import Stubber
 
 import aiobotocore.session
-from aiobotocore._helpers import asynccontextmanager
 
 
 class StubbedSession(aiobotocore.session.AioSession):

tests/boto_tests/test_credentials.py

@@ -8,6 +8,7 @@
 import sys
 import tempfile
 import uuid
+from contextlib import asynccontextmanager
 from datetime import datetime, timedelta
 from functools import partial
 from typing import Optional
@@ -31,7 +32,6 @@
 from dateutil.tz import tzlocal, tzutc
 
 from aiobotocore import credentials
-from aiobotocore._helpers import asynccontextmanager
 from aiobotocore.credentials import (
  AioAssumeRoleProvider,
  AioCanonicalNameCredentialSourcer,

tests/boto_tests/test_utils.py

@@ -2,14 +2,14 @@
 
 import itertools
 import json
+from contextlib import asynccontextmanager
 from typing import Iterator, Tuple, Union
 
 import pytest
 from botocore.exceptions import ReadTimeoutError
 from botocore.utils import BadIMDSRequestError
 
 from aiobotocore import utils
-from aiobotocore._helpers import asynccontextmanager
 
 # TypeAlias (requires typing_extensions or >=3.10 to annotate)
 Response = Tuple[Union[str, object], int]