Fix botocore > 1.11.0 compatibility for proxies (pynamodb#531)

Moutix · garrettheel · commit e3cb9d4e45a5 · 2018-08-30T22:20:52.000+10:00
diff --git a/pynamodb/connection/base.py b/pynamodb/connection/base.py
@@ -351,10 +351,15 @@ def _make_api_call(self, operation_name, operation_kwargs):
 
             response = None
             try:
+                proxies = getattr(self.client._endpoint, "proxies", None)
+                # After the version 1.11.0 of botocore this field is no longer available here
+                if proxies is None:
+                    proxies = self.client._endpoint.http_session._proxy_config._proxies
+
                 response = self.requests_session.send(
                     prepared_request,
                     timeout=self._request_timeout_seconds,
-                    proxies=self.client._endpoint.proxies,
+                    proxies=proxies,
                 )
                 data = response.json()
             except (requests.RequestException, ValueError) as e:
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,7 +6,7 @@
 # we didn't want to bump the actual dependency of the library for consumers as it would effectively
 # be a breaking change. As a result, we use the 1.6.0 dependency for development here for the
 # purpose of integration tests, even though requirements.txt still has 1.2.0.
-botocore==1.6.0
+botocore==1.11.4
 six==1.9.0
 coverage==3.7.1
 mock==2.0.0
