4.x - fix for botocore 1.33.2 (based off Pull Request #1206 made for …

…5.x branch) (#1235)
pynamodb · May 20, 2024 · ba49719 · ba49719
1 parent b0c37e6
commit ba49719
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 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
@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+v4.4.1
+----------
+* Fix compatibility with botocore 1.33.2 (#1235)
+
+
 v4.4.0
 ----------
 * Update for botocore 1.28 private API change (#1130) which caused the following exception::

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,4 @@
 .[signals]
-sphinx-rtd-theme==0.4.3
+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__ = '4.4.0'
+__version__ = '4.4.1'
diff --git a/pynamodb/connection/base.py b/pynamodb/connection/base.py
@@ -375,9 +375,11 @@ def _make_api_call(self, operation_name, operation_kwargs):
                 '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,