Fix endpoint circular import issue (#1395)

Author: thehesiod

.github/workflows/ci-cd.yml

@@ -50,16 +50,17 @@ jobs:
           os: ubuntu-24.04
           no-httpx: true
           experimental: false
-        # add experimental 3.14 runs. Move this to being a 3.14 python-version
-        # entry when stable.
-        - python-version: 3.14
-          os: ubuntu-24.04
-          no-httpx: false
-          experimental: true
-        - python-version: 3.14
-          os: ubuntu-24.04-arm
-          no-httpx: false
-          experimental: true
+
+      # add experimental 3.14 runs. Move this to being a 3.14 python-version
+      # entry when stable.
+      # - python-version: 3.14
+      #   os: ubuntu-24.04
+      #   no-httpx: false
+      #   experimental: true
+      # - python-version: 3.14
+      #   os: ubuntu-24.04-arm
+      #   no-httpx: false
+      #   experimental: true
       fail-fast: false
     uses: ./.github/workflows/reusable-test.yml
     with:

CHANGES.rst

@@ -1,5 +1,8 @@
 Changes
 -------
+2.24.1 (2025-08-15)
+^^^^^^^^^^^^^^^^^^^
+* fix endpoint circular import error
 
 2.24.0 (2025-07-31)
 ^^^^^^^^^^^^^^^^^^^

aiobotocore/__init__.py

@@ -1 +1 @@
-__version__ = '2.24.0'
+__version__ = '2.24.1'

aiobotocore/_constants.py

@@ -0,0 +1,5 @@
+# AWS has a 20 second idle timeout:
+#   https://web.archive.org/web/20150926192339/https://forums.aws.amazon.com/message.jspa?messageID=215367
+# and aiohttp default timeout is 30s so we set it to something
+# reasonable here
+DEFAULT_KEEPALIVE_TIMEOUT = 12

aiobotocore/config.py

@@ -3,14 +3,9 @@
 import botocore.client
 from botocore.exceptions import ParamValidationError
 
-from aiobotocore.endpoint import DEFAULT_HTTP_SESSION_CLS
-from aiobotocore.httpxsession import HttpxSession
-
-# AWS has a 20 second idle timeout:
-#   https://web.archive.org/web/20150926192339/https://forums.aws.amazon.com/message.jspa?messageID=215367
-# and aiohttp default timeout is 30s so we set it to something
-# reasonable here
-DEFAULT_KEEPALIVE_TIMEOUT = 12
+from ._constants import DEFAULT_KEEPALIVE_TIMEOUT
+from .endpoint import DEFAULT_HTTP_SESSION_CLS
+from .httpxsession import HttpxSession
 
 TIMEOUT_ARGS = frozenset(
     ('keepalive_timeout', 'write_timeout', 'pool_timeout')

aiobotocore/httpsession.py

@@ -40,8 +40,9 @@
 from multidict import CIMultiDict
 
 import aiobotocore.awsrequest
-import aiobotocore.config
-from aiobotocore._endpoint_helpers import _IOBaseWrapper, _text
+
+from ._constants import DEFAULT_KEEPALIVE_TIMEOUT
+from ._endpoint_helpers import _IOBaseWrapper, _text
 
 
 class AIOHTTPSession:
@@ -85,7 +86,7 @@ def __init__(
         self._connector_args = connector_args
         if self._connector_args is None:
             self._connector_args = dict(
-                keepalive_timeout=aiobotocore.config.DEFAULT_KEEPALIVE_TIMEOUT
+                keepalive_timeout=DEFAULT_KEEPALIVE_TIMEOUT
             )
 
         self._max_pool_connections = max_pool_connections

aiobotocore/httpxsession.py

@@ -26,9 +26,10 @@
 from multidict import CIMultiDict
 
 import aiobotocore.awsrequest
-import aiobotocore.config  # avoid circular import
 from aiobotocore._endpoint_helpers import _text
 
+from ._constants import DEFAULT_KEEPALIVE_TIMEOUT
+
 try:
     import httpx
 except ImportError:
@@ -61,7 +62,7 @@ def __init__(
 
         if connector_args is None:
             self._connector_args: dict[str, Any] = {
-                'keepalive_timeout': aiobotocore.config.DEFAULT_KEEPALIVE_TIMEOUT
+                'keepalive_timeout': DEFAULT_KEEPALIVE_TIMEOUT
             }
         else:
             self._connector_args = connector_args