Merge pull request jaysonsantos#45 from Photonomie/fix-python3-support

jaysonsantos · jaysonsantos · commit 4fa1b2592346 · 2015-11-26T10:09:17.000+01:00
Use a binary string to compare the auth method
diff --git a/bmemcached/protocol.py b/bmemcached/protocol.py
@@ -269,7 +269,7 @@ def _send_authentication(self):
 
         methods = extra_content
 
-        if 'PLAIN' not in methods:
+        if b'PLAIN' not in methods:
             raise AuthenticationNotSupported('This module only supports '
                                              'PLAIN auth for now.')
 
diff --git a/test/test_auth.py b/test/test_auth.py
@@ -36,7 +36,7 @@ def testAuthNotSuccessful(self, mocked_response):
         """
         Raise MemcachedException for anything unsuccessful.
         """
-        mocked_response.return_value = (0, 0, 0, 0, 0, 0x01, 0, 0, 0, ['PLAIN'])
+        mocked_response.return_value = (0, 0, 0, 0, 0, 0x01, 0, 0, 0, [b'PLAIN'])
         server = bmemcached.client.Protocol('127.0.0.1')
         self.assertRaises(MemcachedException,
                           server.authenticate, 'user', 'password')
@@ -46,7 +46,7 @@ def testAuthSuccessful(self, mocked_response):
         """
         Valid logins return True.
         """
-        mocked_response.return_value = (0, 0, 0, 0, 0, 0, 0, 0, 0, ['PLAIN'])
+        mocked_response.return_value = (0, 0, 0, 0, 0, 0, 0, 0, 0, [b'PLAIN'])
         server = bmemcached.client.Protocol('127.0.0.1')
         self.assertTrue(server.authenticate('user', 'password'))
 
@@ -55,7 +55,7 @@ def testAuthUnsuccessful(self, mocked_response):
         """
         Invalid logins raise InvalidCredentials
         """
-        mocked_response.return_value = (0, 0, 0, 0, 0, 0x08, 0, 0, 0, ['PLAIN'])
+        mocked_response.return_value = (0, 0, 0, 0, 0, 0x08, 0, 0, 0, [b'PLAIN'])
         server = bmemcached.client.Protocol('127.0.0.1')
         self.assertRaises(InvalidCredentials, server.authenticate,
                           'user', 'password2')
diff --git a/test/test_server_parsing.py b/test/test_server_parsing.py
@@ -43,7 +43,7 @@ def testPassCredentials(self, mocked_response):
         """
         If username/password passed to Client, auto-authenticate.
         """
-        mocked_response.return_value = (0, 0, 0, 0, 0, 0, 0, 0, 0, ['PLAIN'])
+        mocked_response.return_value = (0, 0, 0, 0, 0, 0, 0, 0, 0, [b'PLAIN'])
         client = bmemcached.Client('127.0.0.1:11211', username='user',
                                    password='password')
         server = list(client.servers)[0]
@@ -56,7 +56,7 @@ def testPassCredentials(self, mocked_response):
 
     @mock.patch.object(bmemcached.client.Protocol, '_get_response')
     def testNoCredentialsNoAuth(self, mocked_response):
-        mocked_response.return_value = (0, 0, 0, 0, 0, 0x01, 0, 0, 0, ['PLAIN'])
+        mocked_response.return_value = (0, 0, 0, 0, 0, 0x01, 0, 0, 0, [b'PLAIN'])
         client = bmemcached.Client('127.0.0.1:11211')
         server = list(client.servers)[0]
 
