FLUSHALL/FLUSHDB no longer sync on disk. Just increment the dirty counter by the...

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

diff --git a/client-libraries/python/redis.py b/client-libraries/python/redis.py
index ec480b3f6aa3c70e0def2a6c1556a669c0e8571a..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()
 
-    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)
-        return self.get_response()
+        res = self.get_response()
+        return None if res == 'none' else res
     
     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()
+        
+    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):
         """
@@ -747,11 +769,11 @@ class Redis(object):
         >>> r = Redis(db=9)
         >>> r.delete('a')
         1
-        >>> r.select(1)
+        >>> r.select(10)
         'OK'
         >>> r.set('a', 1)
         'OK'
-        >>> r.select(0)
+        >>> r.select(9)
         'OK'
         >>> r.get('a')
         >>> 
@@ -930,4 +952,4 @@ class Redis(object):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-    
\ No newline at end of file
+