Python client library updated, thanks to Ludo!

[redis.git] / client-libraries / python / redis.py

diff --git a/client-libraries/python/redis.py b/client-libraries/python/redis.py
index e844f812b05e348aa470fbdcad2219446e93308a..954c2769098bf3c999152756e1bf6e2435d7c8c6 100644 (file)
--- a/client-libraries/python/redis.py
+++ b/client-libraries/python/redis.py
@@ -140,6 +140,19 @@ class Redis(object):
         self._write('GET %s\r\n' % name)
         return self._get_value()
     
         self._write('GET %s\r\n' % name)
         return self._get_value()
     

+    def mget(self, *args):
+        """
+        >>> r = Redis()
+        >>> r.set('a', 'pippo'), r.set('b', 15), r.set('c', '\\r\\naaa\\nbbb\\r\\ncccc\\nddd\\r\\n'), r.set('d', '\\r\\n')
+        ('OK', 'OK', 'OK', 'OK')
+        >>> r.mget('a', 'b', 'c', 'd')
+        ['pippo', '15', '\\r\\naaa\\nbbb\\r\\ncccc\\nddd\\r\\n', '\\r\\n']
+        >>> 
+        """
+        self.connect()
+        self._write('MGET %s\r\n' % ' '.join(args))
+        return self._get_multi_response()
+    

     def incr(self, name, amount=1):
         """
         >>> r = Redis()
     def incr(self, name, amount=1):
         """
         >>> r = Redis()


@@ -827,6 +840,26 @@ class Redis(object):
         self._write('%s\r\n' % ('FLUSHALL' if all_dbs else 'FLUSHDB'))
         return self._get_simple_response()
     
         self._write('%s\r\n' % ('FLUSHALL' if all_dbs else 'FLUSHDB'))
         return self._get_simple_response()
     

+    def info(self):
+        """
+        >>> r = Redis()
+        >>> info = r.info()
+        >>> info and isinstance(info, dict)
+        True
+        >>> isinstance(info.get('connected_clients'), int)
+        True
+        >>> 
+        """
+        self.connect()
+        self._write('INFO\r\n')
+        info = dict()
+        for l in self._get_value().split('\r\n'):
+            if not l:
+                continue
+            k, v = l.split(':', 1)
+            info[k] = int(v) if v.isdigit() else v
+        return info
+    

     def _get_value(self, negative_as_nil=False):
         data = self._read().strip()
         if data == 'nil' or (negative_as_nil and data == '-1'):
     def _get_value(self, negative_as_nil=False):
         data = self._read().strip()
         if data == 'nil' or (negative_as_nil and data == '-1'):