add expire command to the python lib

diff --git a/client-libraries/python/redis.py b/client-libraries/python/redis.py
index ed73472365aa56e043e453b8b1d42b36f13e6bea..881dfd1de7d4394cc06538ce3f98e85bcf16a765 100644 (file)
--- a/client-libraries/python/redis.py
+++ b/client-libraries/python/redis.py
@@ -231,13 +231,20 @@ class Redis(object):
         self._write('DEL %s\r\n' % name)
         return self.get_response()
 
         self._write('DEL %s\r\n' % name)
         return self.get_response()
 

-    def key_type(self, name):
+    def get_type(self, name):

         """
         """

-        Not yet implemented.
+        >>> r = Redis(db=9)
+        >>> r.set('a', 3)
+        'OK'
+        >>> r.get_type('a')
+        'string'
+        >>> r.get_type('zzz')
+        >>> 

         """
         self.connect()
         self._write('TYPE %s\r\n' % name)
         """
         self.connect()
         self._write('TYPE %s\r\n' % name)

-        return self.get_response()
+        res = self.get_response()
+        return None if res == 'none' else res

     
     def keys(self, pattern):
         """
     
     def keys(self, pattern):
         """


@@ -304,6 +311,21 @@ class Redis(object):
         else:
             self._write('RENAME %s %s\r\n' % (src, dst))
             return self.get_response() #.strip()
         else:
             self._write('RENAME %s %s\r\n' % (src, dst))
             return self.get_response() #.strip()

+        
+    def expire(self, name, time):
+        """
+        >>> r = Redis(db=9)
+        >>> r.set('a', 1)
+        'OK'
+        >>> r.expire('a', 1)
+        1
+        >>> r.expire('zzzzz', 1)
+        0
+        >>> 
+        """
+        self.connect()
+        self._write('EXPIRE %s %s\r\n' % (name, time))
+        return self.get_response()

     
     def push(self, name, value, tail=False):
         """
     
     def push(self, name, value, tail=False):
         """