Ticket #7460: memcachedkeys.diff

django/core/cache/backends/memcached.py

@@ -1 +1 @@
 "Memcached cache backend"
 
 from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError
-from django.utils.encoding import smart_unicode, smart_str
+from django.utils.encoding import smart_unicode
+from django.utils.http import urlquote
 
 try:
     import cmemcache as memcache
@@ -17 +18 @@
         self._cache = memcache.Client(server.split(';'))
 
     def add(self, key, value, timeout=0):
-        return self._cache.add(key.encode('ascii', 'ignore'), value, timeout or self.default_timeout)
+        return self._cache.add(urlquote(key), value, timeout or self.default_timeout)
 
     def get(self, key, default=None):
-        val = self._cache.get(smart_str(key))
+        val = self._cache.get(urlquote(key))
         if val is None:
             return default
         else:
@@ -32 +33 @@
     def set(self, key, value, timeout=0):
         if isinstance(value, unicode):
             value = value.encode('utf-8')
-        self._cache.set(smart_str(key), value, timeout or self.default_timeout)
+        self._cache.set(urlquote(key), value, timeout or self.default_timeout)
 
     def delete(self, key):
-        self._cache.delete(smart_str(key))
+        self._cache.delete(urlquote(key))
 
     def get_many(self, keys):
-        return self._cache.get_multi(map(smart_str,keys))
+        return self._cache.get_multi(map(urlquote, keys))
 
     def close(self, **kwargs):
         self._cache.disconnect_all()
-