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

2015-03-26 12:39:09 +01:00
parent d58d102b2d
commit fc98b5d352
1 changed files with 5 additions and 2 deletions
@@ -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' % (