Make sure environment settings are merged in for requests

Fixes #557
2017-04-17 21:59:03 +02:00
parent 5e63ea4f93
commit c318f7fa63
1 changed files with 6 additions and 5 deletions
@@ -67,12 +67,13 @@ class RequestsHttpConnection(Connection):
            url = '%s?%s' % (url, urlencode(params or {}))

        start = time.time()
+        request = requests.Request(method=method, url=url, data=body)
+        prepared_request = self.session.prepare_request(request)
+        settings = self.session.merge_environment_settings(prepared_request.url, {}, None, None, None)
+        send_kwargs = {'timeout': timeout or self.timeout}
+        send_kwargs.update(settings)
        try:
-            request = requests.Request(method=method, url=url, data=body)
-            prepared_request = self.session.prepare_request(request)
-            response = self.session.send(
-                prepared_request,
-                timeout=timeout or self.timeout)
+            response = self.session.send(prepared_request, **send_kwargs)
            duration = time.time() - start
            raw_data = response.text
        except Exception as e: