From fc98b5d352ed5906fc58d50ace5a4f1474a2e4a5 Mon Sep 17 00:00:00 2001 From: Georges Toth Date: Thu, 26 Mar 2015 12:39:09 +0100 Subject: [PATCH] Modify test for http_auth to allow for passing custom authentication methods as well --- elasticsearch/connection/http_requests.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/elasticsearch/connection/http_requests.py b/elasticsearch/connection/http_requests.py index 4eb4fe7d..fde9355a 100644 --- a/elasticsearch/connection/http_requests.py +++ b/elasticsearch/connection/http_requests.py @@ -1,3 +1,4 @@ +import six import time import warnings try: @@ -32,8 +33,10 @@ class RequestsHttpConnection(Connection): super(RequestsHttpConnection, self).__init__(host= host, port=port, **kwargs) self.session = requests.session() if http_auth is not None: - if not isinstance(http_auth, (tuple, list)): - http_auth = http_auth.split(':', 1) + if isinstance(http_auth, (tuple, list)): + http_auth = tuple(http_auth) + elif isinstance(http_auth, six.string_types): + http_auth = tuple(http_auth.split(':', 1)) http_auth = tuple(http_auth) self.session.auth = http_auth self.base_url = 'http%s://%s:%d%s' % (