Fix compatibility with botocore 1.33.2 (#1206)

pynamodb · Nov 29, 2023 · 7b60000 · 7b60000
1 parent b25a88e
commit 7b60000
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,19 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+# Optionally declare the Python requirements required to build your docs
+python:
+   install:
+   - requirements: docs/requirements.txt
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -3,6 +3,10 @@
 Release Notes
 =============
 
+v5.5.1
+----------
+* Fix compatibility with botocore 1.33.2 (#1205)
+
 v5.5.0
 ----------
 * :meth:`~pynamodb.models.Model.save`, :meth:`~pynamodb.models.Model.update`, :meth:`~pynamodb.models.Model.delete_item`,

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1 +1,4 @@
-sphinx-rtd-theme==0.4.3
+.[signals]
+sphinx>=5
+sphinx-rtd-theme==1.1.1
+sphinx-issues
diff --git a/pynamodb/__init__.py b/pynamodb/__init__.py
@@ -7,4 +7,4 @@
 """
 __author__ = 'Jharrod LaFon'
 __license__ = 'MIT'
-__version__ = '5.5.0'
+__version__ = '5.5.1'
diff --git a/pynamodb/connection/base.py b/pynamodb/connection/base.py
@@ -14,7 +14,7 @@
 
 import botocore.client
 import botocore.exceptions
-from botocore.awsrequest import AWSPreparedRequest, create_request_object
+from botocore.awsrequest import AWSPreparedRequest, create_request_object, AWSResponse
 from botocore.client import ClientError
 from botocore.hooks import first_non_none_response
 from botocore.exceptions import BotoCoreError
@@ -380,9 +380,11 @@ def _make_api_call(self, operation_name: str, operation_kwargs: Dict, settings:
                 'has_streaming_input': operation_model.has_streaming_input,
                 'auth_type': operation_model.auth_type,
             }
-            endpoint_url, additional_headers = self.client._resolve_endpoint_ruleset(
+            endpoint_url, additional_headers, *rest = self.client._resolve_endpoint_ruleset(
                 operation_model, operation_kwargs, request_context
             )
+            if rest and rest[0]:
+                request_context['endpoint_properties'] = rest[0]
             request_dict = self.client._convert_to_request_dict(
                 api_params=operation_kwargs,
                 operation_model=operation_model,
@@ -400,7 +402,6 @@ def _make_api_call(self, operation_name: str, operation_kwargs: Dict, settings:
             attempt_number = i + 1
             is_last_attempt_for_exceptions = i == self._max_retry_attempts_exception
 
-            http_response = None
             prepared_request = None
             try:
                 if prepared_request is not None:
@@ -432,8 +433,6 @@ def _make_api_call(self, operation_name: str, operation_kwargs: Dict, settings:
             except (ValueError, botocore.exceptions.HTTPClientError, botocore.exceptions.ConnectionError) as e:
                 if is_last_attempt_for_exceptions:
                     log.debug('Reached the maximum number of retry attempts: %s', attempt_number)
-                    if http_response:
-                        e.args += (http_response.text,)
                     raise
                 else:
                     # No backoff for fast-fail exceptions that likely failed at the frontend