Merge lp:~klaussfreire/python-memcached/python-memcached into lp:python-memcached

[klauss]

Implements ElastiCache's "config get" command.
Useful since EC is almost memcache, so having python-memcached support it is probably the best in terms of maintainability.
EC's "config get" is just a get with another name, really. So the implementation works like that, reusing most of the code.

Unmerged revisions

60. By klauss on 2015-12-23

Must catch NameError, not AttributeError

59. By klauss on 2015-08-31

Make sure python 2.x uses xrange instead of range (slow and potentially memory hungry if server weight were high)

58. By klauss on 2015-05-08

Implement ElastiCache's "config get" command (useful for working with ElastiCache clusters)

=== modified file 'memcache.py'
--- memcache.py	2012-04-11 06:07:54 +0000
+++ memcache.py	2015-12-23 02:30:58 +0000
@@ -52,6 +52,11 @@
     import cPickle as pickle
 except ImportError:
     import pickle
+try:
+    # Python2 should use the generator version
+    range = xrange
+except NameError:
+    pass
 
 from binascii import crc32   # zlib version is not cross-platform
 def cmemcache_hash(key):
@@ -836,6 +841,9 @@
                             raise_exception=True)
                     if rkey and self.cache_cas:
                         self.cas_ids[rkey] = cas_id
+                elif cmd == 'config get':
+                    rkey, flags, rlen, = self._expectvalue(server,
+                            raise_exception=True, tag='CONFIG', taglen=6)
                 else:
                     rkey, flags, rlen, = self._expectvalue(server,
                             raise_exception=True)
@@ -872,6 +880,13 @@
         '''
         return self._get('get', key)
 
+    def get_config(self, key):
+        '''Retrieves a key from the memcache.
+
+        @return: The value or None.
+        '''
+        return self._get('config get', key)
+
     def gets(self, key):
         '''Retrieves a key from the memcache. Used in conjunction with 'cas'.
 
@@ -961,11 +976,11 @@
         else:
             return (None, None, None, None)
 
-    def _expectvalue(self, server, line=None, raise_exception=False):
+    def _expectvalue(self, server, line=None, raise_exception=False, tag="VALUE", taglen=5):
         if not line:
             line = server.readline(raise_exception)
 
-        if line and line[:5] == 'VALUE':
+        if line and line[:taglen] == tag:
             resp, rkey, flags, len = line.split()
             flags = int(flags)
             rlen = int(len)