Fix support newbytes from future

pymemcache/client/base.py

@@ -88,7 +88,10 @@ def _check_key(key, allow_unicode_keys, key_prefix=b''):
             key = key.encode('utf8')
     elif isinstance(key, VALID_STRING_TYPES):
         try:
-            key = key.encode('ascii')
+            if isinstance(key, bytes):
+                key = key.decode().encode('ascii')
+            else:
+                key = key.encode('ascii')
         except (UnicodeEncodeError, UnicodeDecodeError):
             raise MemcacheIllegalInputError("Non-ASCII key: '%r'" % key)
 

pymemcache/test/test_client.py

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import bytes as newbytes
+
 import collections
 import errno
 import functools
@@ -100,6 +102,11 @@ def test_set_success(self):
         result = client.set(b'key', b'value', noreply=False)
         assert result is True
 
+    def test_set_future(self):
+        client = self.make_client([b'STORED\r\n'])
+        result = client.set(newbytes(b'key'), newbytes(b'value'), noreply=False)
+        assert result is True
+
     def test_set_unicode_key(self):
         client = self.make_client([b''])
 

pymemcache/test/test_integration.py

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from builtins import bytes as newbytes
+
 from collections import defaultdict
 import json
 import pytest
@@ -60,6 +62,18 @@ def test_get_set(client_class, host, port, socket_module):
     get_set_helper(client, key, value, key2, value2)
 
 
+@pytest.mark.integration()
+def test_get_set_newbytes(client_class, host, port, socket_module):
+    client = client_class((host, port), socket_module=socket_module)
+    client.flush_all()
+
+    key = newbytes(b'key3')
+    value = b'value3'
+    key2 = newbytes(b'key4')
+    value2 = b'value4'
+    get_set_helper(client, key, value, key2, value2)
+
+
 @pytest.mark.integration()
 def test_get_set_unicode_key(client_class, host, port, socket_module):
     client = client_class((host, port), socket_module=socket_module,

pymemcache/test/utils.py

@@ -48,7 +48,10 @@ def get(self, key, default=None):
                 raise MemcacheIllegalInputError(key)
             if isinstance(key, six.string_types):
                 try:
-                    key = key.encode('ascii')
+                    if isinstance(key, bytes):
+                        key = key.decode().encode('ascii')
+                    else:
+                        key = key.encode('ascii')
                 except (UnicodeEncodeError, UnicodeDecodeError):
                     raise MemcacheIllegalInputError
 
@@ -80,7 +83,10 @@ def set(self, key, value, expire=0, noreply=True):
                 raise MemcacheIllegalInputError(key)
             if isinstance(key, six.string_types):
                 try:
-                    key = key.encode('ascii')
+                    if isinstance(key, bytes):
+                        key = key.decode().encode('ascii')
+                    else:
+                        key = key.encode('ascii')
                 except (UnicodeEncodeError, UnicodeDecodeError):
                     raise MemcacheIllegalInputError
         if isinstance(value, six.text_type):

test-requirements.txt

@@ -4,3 +4,4 @@ pytest-cov
 gevent==1.3.6; "PyPy" not in platform_python_implementation
 pylibmc
 python-memcached
+future