Ticket #11675: memcached.py.diff

@@ -4,22 +4,28 @@
 from django.utils.encoding import smart_unicode, smart_str
 
 try:
-    import cmemcache as memcache
+    import pylibmc as memcache
 except ImportError:
     try:
-        import memcache
-    except:
-        raise InvalidCacheBackendError("Memcached cache backend requires either the 'memcache' or 'cmemcache' library")
+        import cmemcache as memcache
+    except ImportError:
+        try:
+            import memcache
+        except:
+            raise InvalidCacheBackendError(
+                "Memcached cache backend requires either the 'memcache' or 'cmemcache' library")
 
 class CacheClass(BaseCache):
     def __init__(self, server, params):
         BaseCache.__init__(self, params)
         self._cache = memcache.Client(server.split(';'))
 
-    def add(self, key, value, timeout=0):
+    def add(self, key, value, timeout=None):
         if isinstance(value, unicode):
             value = value.encode('utf-8')
-        return self._cache.add(smart_str(key), value, timeout or self.default_timeout)
+        # if timeout is 0, it is eternal cache.
+        return self._cache.add(smart_str(key), value,
+            self.default_timeout if timeout is None else timeout)
 
     def get(self, key, default=None):
         val = self._cache.get(smart_str(key))
@@ -31,10 +37,11 @@
             else:
                 return val
 
-    def set(self, key, value, timeout=0):
+    def set(self, key, value, timeout=None):
         if isinstance(value, unicode):
             value = value.encode('utf-8')
-        self._cache.set(smart_str(key), value, timeout or self.default_timeout)
+        self._cache.set(smart_str(key), value,
+            self.default_timeout if timeout is None else timeout)
 
     def delete(self, key):
         self._cache.delete(smart_str(key))
@@ -45,8 +52,17 @@
     def close(self, **kwargs):
         self._cache.disconnect_all()
 
+    # a convenient function(needed?)
+    def disconnect_all(self, **kwargs):
+        self._cache.disconnect_all()
+
     def incr(self, key, delta=1):
         return self._cache.incr(key, delta)
 
     def decr(self, key, delta=1):
         return self._cache.decr(key, delta)
+
+    def flush_all(self):
+        self._cache.flush_all()
+
+