Merge branch 'master' into dont_override_logging_root_handler

Author: iserko

pyres/__init__.py

@@ -116,7 +116,7 @@ class ResQ(object):
 
     The ``__init__`` takes these keyword arguments:
 
-        ``server`` -- IP address and port of the Redis server to which you want to connect. Default is `localhost:6379`.
+        ``server`` -- IP address and port of the Redis server to which you want to connect, and optional Redis DB number. Default is `localhost:6379`.
 
         ``password`` -- The password, if required, of your Redis server. Default is "None".
 
@@ -188,8 +188,9 @@ def _get_redis(self):
     def _set_redis(self, server):
         if isinstance(server, basestring):
             self.dsn = server
-            host, port = server.split(':')
-            self._redis = Redis(host=host, port=int(port), password=self.password)
+            address, _, db = server.partition('/')
+            host, port = address.split(':')
+            self._redis = Redis(host=host, port=int(port), db=int(db or 0), password=self.password)
             self.host = host
             self.port = int(port)
         elif isinstance(server, Redis):

pyres/worker.py

@@ -19,7 +19,7 @@ class Worker(object):
     class and passes a comma-separated list of queues to listen on.::
 
        >>> from pyres.worker import Worker
-       >>> Worker.run([queue1, queue2], server="localhost:6379")
+       >>> Worker.run([queue1, queue2], server="localhost:6379/0")
 
     """