check_key: Auto-convert unicode keys to bytes for better Python 3

compat

It would be a bit of a pain (and ugly) in Python 3 to have to prefix all
literal keys with the "b" literal notation for bytes.

1 files changed, 4 insertions, 6 deletions

diff --git a/memcache.py b/memcache.py
index daa3781..7326c53 100644
--- a/memcache.py
+++ b/memcache.py
@@ -1121,14 +1121,12 @@ class Client(threading.local):
             key = key[1]
         if not key:
             raise Client.MemcachedKeyNoneError("Key is None")
-        if isinstance(key, unicode):
-            raise Client.MemcachedStringEncodingError(
-                "Keys must be str()'s, not unicode.  Convert your unicode "
-                "strings using mystring.encode(charset)!")
-        if not isinstance(key, str):
+        if isinstance(key, six.text_type):
+            key = key.encode('ascii')
+        if not isinstance(key, six.binary_type):
             raise Client.MemcachedKeyTypeError("Key must be str()'s")
 
-        if isinstance(key, basestring):
+        if isinstance(key, six.string_types):
             if self.server_max_key_length != 0 and \
                     len(key) + key_extra_len > self.server_max_key_length:
                 raise Client.MemcachedKeyLengthError(