actions/opensearch-pyd
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Modify test for http_auth to allow for passing custom authentication methods as well

Browse Source
This commit is contained in:
Georges Toth
2015-03-26 12:39:09 +01:00
parent d58d102b2d
commit fc98b5d352
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/connection/http_requests.py
+5 -2
View File
@@ -1,3 +1,4 @@
import six
import time import time
import warnings import warnings
try: try:
@@ -32,8 +33,10 @@ class RequestsHttpConnection(Connection):
super(RequestsHttpConnection, self).__init__(host= host, port=port, **kwargs) super(RequestsHttpConnection, self).__init__(host= host, port=port, **kwargs)
self.session = requests.session() self.session = requests.session()
if http_auth is not None: if http_auth is not None:
if not isinstance(http_auth, (tuple, list)): if isinstance(http_auth, (tuple, list)):
http_auth = http_auth.split(':', 1) http_auth = tuple(http_auth)
elif isinstance(http_auth, six.string_types):
http_auth = tuple(http_auth.split(':', 1))
http_auth = tuple(http_auth) http_auth = tuple(http_auth)
self.session.auth = http_auth self.session.auth = http_auth
self.base_url = 'http%s://%s:%d%s' % ( self.base_url = 'http%s://%s:%d%s' % (