changes to help with new empty list/set returns

from redis-py

Author: Matt George

pyres/__init__.py

@@ -88,7 +88,7 @@ def peek(self, queue, start=0, count=1):
         return self.list_range('resque:queue:%s' % queue, start, count)
 
     def list_range(self, key, start, count):
-        items = self.redis.lrange(key, start,start+count-1)
+        items = self.redis.lrange(key, start,start+count-1) or []
         ret_list = []
         for i in items:
             ret_list.append(ResQ.decode(i))
@@ -125,7 +125,7 @@ def enqueue_from_string(self, klass_as_string, queue, *args):
         self.push(queue, {'class':klass_as_string,'args':args})
 
     def queues(self):
-        return self.redis.smembers("resque:queues")
+        return self.redis.smembers("resque:queues") or []
 
     def info(self):
         """

resweb/views.py

@@ -313,12 +313,14 @@ def key_type(self):
     def items(self):
         items = []
         if self.key_type() == 'list':
-            for k in self.resq.redis.lrange('resque:'+self.stat_id,0,20):
+            lst = self.resq.redis.lrange('resque:'+self.stat_id,0,20) or []
+            for k in lst:
                 items.append({
                     'row':str(k)
                 })
         elif self.key_type() == 'set':
-            for k in self.resq.redis.smembers('resque:'+self.stat_id):
+            st = self.resq.redis.smembers('resque:'+self.stat_id) or set([])
+            for k in st:
                 items.append({
                     'row':str(k)
                 })

tests/test_resq.py

@@ -90,3 +90,13 @@ def test_keys(self):
         assert 'queue:basic' in self.resq.keys()
         assert 'queues' in self.resq.keys()
 
+    def test_queues(self):
+        assert self.resq.queues() == []
+        self.resq.enqueue_from_string('tests.Basic','basic','test1')
+        assert len(self.resq.queues()) == 1
+        self.resq.enqueue_from_string('tests.Basic','basic','test1')
+        assert len(self.resq.queues()) == 1
+        self.resq.enqueue_from_string('tests.Basic','basic2','test1')
+        assert len(self.resq.queues()) == 2
+        assert 'test' not in self.resq.queues()
+        assert 'basic' in self.resq.queues()