cache: Remove obsolete PyMemcache implementation.

r2/r2/lib/cache.py

@@ -32,7 +32,6 @@ from pycassa import ColumnFamily
 from pycassa.cassandra.ttypes import ConsistencyLevel
 from pycassa.cassandra.ttypes import NotFoundException as CassandraNotFound
 
-from r2.lib.contrib import memcache
 from r2.lib.utils import in_chunks, prefix_keys, trace
 from r2.lib.hardcachebackend import HardCacheBackend
 
@@ -60,36 +59,6 @@ class CacheUtils(object):
     def get_multi(self, keys, prefix='', **kw):
         return prefix_keys(keys, prefix, lambda k: self.simple_get_multi(k, **kw))
 
-class PyMemcache(CacheUtils, memcache.Client):
-    """We still use our patched python-memcache to talk to the
-       permacaches for legacy reasons"""
-    simple_get_multi = memcache.Client.get_multi
-
-    def __init__(self, servers):
-        memcache.Client.__init__(self, servers, pickleProtocol = 1)
-
-    def set_multi(self, keys, prefix='', time=0):
-        new_keys = {}
-        for k,v in keys.iteritems():
-            new_keys[str(k)] = v
-        memcache.Client.set_multi(self, new_keys, key_prefix = prefix,
-                                  time = time)
-
-    def get(self, key, default=None):
-        r = memcache.Client.get(self, key)
-        if r is None: return default
-        return r
-
-    def set(self, key, val, time=0):
-        memcache.Client.set(self, key, val, time = time)
-
-    def delete(self, key, time=0):
-        memcache.Client.delete(self, key, time=time)
-
-    def delete_multi(self, keys, prefix='', time=0):
-        memcache.Client.delete_multi(self, keys, time = time,
-                                     key_prefix = prefix)
-
 class CMemcache(CacheUtils):
     def __init__(self,
                  servers,