From c318f7fa63b94c3c126ed192bc09e792a6f6da91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Mon, 17 Apr 2017 21:59:03 +0200 Subject: [PATCH] Make sure environment settings are merged in for requests Fixes #557 --- elasticsearch/connection/http_requests.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/elasticsearch/connection/http_requests.py b/elasticsearch/connection/http_requests.py index 7f4bbe7f..f2a9d3f1 100644 --- a/elasticsearch/connection/http_requests.py +++ b/elasticsearch/connection/http_requests.py @@ -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: