From 676f71a211d762b25adc2ddfd4dcc84e90744f37 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Mon, 9 May 2011 14:13:05 -0700 Subject: [PATCH] Upgrade to pylibmc 1.1.1. * Fixes app segfaults when memcache not available. * Remove "time" parameter from r2.lib.cache.CMemcache.delete_multi since it never worked anyway and was removed from pylibmc. --- r2/r2/lib/cache.py | 5 ++--- r2/setup.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/r2/r2/lib/cache.py b/r2/r2/lib/cache.py index a127fd365..097d403fb 100644 --- a/r2/r2/lib/cache.py +++ b/r2/r2/lib/cache.py @@ -177,10 +177,9 @@ class CMemcache(CacheUtils): with self.clients.reserve() as mc: return mc.delete(key) - def delete_multi(self, keys, prefix='', time=0): + def delete_multi(self, keys, prefix=''): with self.clients.reserve() as mc: - return mc.delete_multi(keys, time = time, - key_prefix = prefix) + return mc.delete_multi(keys, key_prefix=prefix) def __repr__(self): return '<%s(%r)>' % (self.__class__.__name__, diff --git a/r2/setup.py b/r2/setup.py index 47c53dde0..60e2dc6b0 100644 --- a/r2/setup.py +++ b/r2/setup.py @@ -85,13 +85,13 @@ except ImportError: # we're using a custom build of pylibmc at the moment, so we need to # be sure that we have the right version -pylibmc_version = '1.0-reddit-04' +pylibmc_version = '1.1.1-reddit-0.1' try: import pylibmc assert pylibmc.__version__ == pylibmc_version except (ImportError, AssertionError): print "Installing pylibmc" - easy_install(["http://github.com/downloads/ketralnis/pylibmc/pylibmc-1.0-reddit-04.tar.gz"]) + easy_install(["https://github.com/downloads/reddit/pylibmc/pylibmc-1.1.1-reddit-0.1.tgz"]) filtermod = Extension('Cfilters', sources = ['r2/lib/c/filters.c'])