* fix for #21, make only the "db" argument of select() required. If host and port aren't specified, the host/port options on the existing connection are used.

* added HINCRBY support

Author: andymccurdy

README.md

@@ -1,25 +1,25 @@
 redis-py
---------
+========
 
 This is the Python interface to the Redis key-value store.
 
 
 Usage
-=====
+-----
 
     >>> import redis
     >>> r = redis.Redis(host='localhost', port=6379, db=0)
     >>> r.set('foo', 'bar')   # or r['foo'] = 'bar'
     True
-    >>> r.get('foo')
+    >>> r.get('foo')   # or r['foo']
     'bar'
 
 For a complete list of commands, check out the list of Redis commands here:
 http://code.google.com/p/redis/wiki/CommandReference
 
 
 Author
-======
+------
 
 redis-py is developed and maintained by Andy McCurdy ([email protected]).
 It can be found here: http://github.com/andymccurdy/redis-py

redis/client.py

@@ -224,7 +224,8 @@ def __init__(self, host='localhost', port=6379,
                 charset='utf-8', errors='strict'):
         self.encoding = charset
         self.errors = errors
-        self.select(host, port, db, password, socket_timeout)
+        self.connection = None
+        self.select(db, host, port, password, socket_timeout)
 
     #### Legacty accessors of connection information ####
     def _get_host(self):
@@ -375,14 +376,28 @@ def _setup_connection(self):
                 raise AuthenticationError("Invalid Password")
         self.format_inline('SELECT', self.connection.db)
 
-    def select(self, host, port, db, password=None, socket_timeout=None):
+    def select(self, db, host=None, port=None, password=None,
+            socket_timeout=None):
         """
-        Switch to a different database on the current host/port
+        Switch to a different Redis connection.
+        
+        If the host and port aren't provided and there's an existing
+        connection, use the existing connection's host and port instead.
         
         Note this method actually replaces the underlying connection object
         prior to issuing the SELECT command.  This makes sure we protect
         the thread-safe connections
         """
+        if host is None:
+            if self.connection is None:
+                raise RedisError("A valid hostname or IP address "
+                    "must be specified")
+            host = self.connection.host
+        if port is None:
+            if self.connection is None:
+                raise RedisError("A valid port must be specified")
+            port = self.connection.port
+        
         self.connection = self.get_connection(
             host, port, db, password, socket_timeout)
 
@@ -939,6 +954,10 @@ def hgetall(self, name):
         "Return a Python dict of the hash's name/value pairs"
         return self.format_inline('HGETALL', name)
 
+    def hincrby(self, name, key, amount=1):
+        "Increment the value of ``key`` in hash ``name`` by ``amount``"
+        return self.format_inline('HINCRBY', name, key, amount)
+        
     def hkeys(self, name):
         "Return the list of keys within hash ``name``"
         return self.format_inline('HKEYS', name)
@@ -1045,6 +1064,6 @@ def execute(self):
             self.connection.disconnect()
             return self._execute(stack)
 
-    def select(self, host, port, db):
+    def select(self, *args, **kwargs):
         raise RedisError("Cannot select a different database from a pipeline")
 

tests/connection_pool.py

@@ -12,14 +12,14 @@ def test_multiple_connections(self):
 
         # if one o them switches, they should have
         # separate conncetion objects
-        r2.select('localhost', 6379, db=10)
+        r2.select(db=10, host='localhost', port=6379)
         self.assertNotEqual(r1.connection, r2.connection)
 
         conns = [r1.connection, r2.connection]
         conns.sort()
 
         # but returning to the original state shares the object again
-        r2.select('localhost', 6379, db=9)
+        r2.select(db=9, host='localhost', port=6379)
         self.assertEquals(r1.connection, r2.connection)
 
         # the connection manager should still have just 2 connections

tests/server_commands.py

@@ -272,7 +272,8 @@ def test_lrem(self):
         self.assertEquals(self.client.lrem('a', 'a', 1), 1)
         self.assertEquals(self.client.lrange('a', 0, 3), ['a', 'a', 'a'])
         self.assertEquals(self.client.lrem('a', 'a'), 3)
-        self.assertEquals(self.client.lrange('a', 0, 1), [])
+        # remove all the elements in the list means the key is deleted
+        self.assertEquals(self.client.lrange('a', 0, 1), None)
 
     def test_lset(self):
         # no key
@@ -755,6 +756,25 @@ def test_hgetall(self):
         remote_hash = self.client.hgetall('a')
         self.assertEquals(h, remote_hash)
 
+    def test_hincrby(self):
+        # key is not a hash
+        self.client['a'] = 'a'
+        self.assertRaises(redis.ResponseError, self.client.hincrby, 'a', 'a1')
+        del self.client['a']
+        # no key should create the hash and incr the key's value to 1
+        self.assertEquals(self.client.hincrby('a', 'a1'), 1)
+        # real logic
+        self.assertEquals(self.client.hincrby('a', 'a1'), 2)
+        self.assertEquals(self.client.hincrby('a', 'a1', amount=2), 4)
+        # negative values decrement
+        self.assertEquals(self.client.hincrby('a', 'a1', amount=-3), 1)
+        # hash that exists, but key that doesn't
+        self.assertEquals(self.client.hincrby('a', 'a2', amount=3), 3)
+        # finally a key that's not an int
+        self.client.hset('a', 'a3', 'foo')
+        self.assertEquals(self.client.hincrby('a', 'a3'), 1)
+        
+        
 
     def test_hkeys(self):
         # key is not a hash