From ebd50c979bcb847b57344671948599a8d40fa786 Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Sun, 7 Aug 2011 12:09:48 -0700
Subject: [PATCH] Upgrade to pylibmc 1.2.1!

cache_lookups is deprecated and verify_key changed names
to verify_keys.
---
 r2/r2/lib/cache.py | 2 --
 r2/setup.py        | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/r2/r2/lib/cache.py b/r2/r2/lib/cache.py
index 097d403fb..cdae9989e 100644
--- a/r2/r2/lib/cache.py
+++ b/r2/r2/lib/cache.py
@@ -98,10 +98,8 @@ class CMemcache(CacheUtils):
             client = pylibmc.Client(servers, binary=True)
             behaviors = {
                 'no_block': no_block, # use async I/O
-                'cache_lookups': True, # cache DNS lookups
                 'tcp_nodelay': True, # no nagle
                 '_noreply': int(noreply),
-                'verify_key': int(debug),  # spend the CPU to verify keys
                 'ketama': True, # consistent hashing
                 }
 
diff --git a/r2/setup.py b/r2/setup.py
index d6ba69a58..587154f20 100644
--- a/r2/setup.py
+++ b/r2/setup.py
@@ -90,8 +90,9 @@ setup(
                       "PIL",
                       "pycaptcha",
                       "amqplib",
-                      "pylibmc==1.1.1"
+                      "pylibmc==1.2.1-dev"
                       ],
+    dependency_links = ['https://github.com/downloads/reddit/pylibmc/pylibmc-1.2.1-dev.tar.gz#egg=pylibmc-1.2.1-dev',],
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,
     test_suite = 'nose.collector',