Make sure that encodestring receives bytes as well as that we decode the bytes object returned

Author: PCManticore

swiftype/swiftype.py

@@ -218,10 +218,9 @@ def _request(self, method, path, params={}, data={}):
     headers = {}
     headers['User-Agent'] = USER_AGENT
     headers['Content-Type'] = 'application/json'
-
     if self.__username is not None and self.__password is not None:
       credentials = "%s:%s" % (self.__username, self.__password)
-      base64_credentials = base64.encodestring(credentials)
+      base64_credentials = base64.encodestring(credentials.encode('utf-8')).decode()
       authorization = "Basic %s" % base64_credentials[:-1]
       headers['Authorization'] = authorization
     elif self.__access_token is not None and self.__api_key is None:

tests/test_swiftype.py

@@ -287,6 +287,23 @@ def __create_temporary_engine(self, name = None):
         name = name if name else self.__time_name()
         return
 
+
+class TestClientUsernameAndPassword(unittest.TestCase):
+
+    def setUp(self):
+        self.client = swiftype.Client(
+            username='some_user',
+            password='some_pasword',
+            host='localhost:3000'
+        )
+
+    def test_engine_create(self):
+        with vcr.use_cassette('fixtures/engine_create.yaml'):
+            engine = 'myengine'
+            slug = self.client.create_engine(engine)['body']['slug']
+            self.assertEqual(slug, engine)
+
+
 class TestPlatformUsers(unittest.TestCase):
 
     def setUp(self):