Merge pull request #573 from jcsaaddupuy/feature/dequeue_any_not_recursive

dequeue_any not recursive

rq/queue.py

@@ -367,25 +367,27 @@ class Queue(object):
 
         See the documentation of cls.lpop for the interpretation of timeout.
         """
-        queue_keys = [q.key for q in queues]
-        result = cls.lpop(queue_keys, timeout, connection=connection)
-        if result is None:
-            return None
-        queue_key, job_id = map(as_text, result)
-        queue = cls.from_queue_key(queue_key, connection=connection)
-        try:
-            job = cls.job_class.fetch(job_id, connection=connection)
-        except NoSuchJobError:
-            # Silently pass on jobs that don't exist (anymore),
-            # and continue by reinvoking the same function recursively
-            return cls.dequeue_any(queues, timeout, connection=connection)
-        except UnpickleError as e:
-            # Attach queue information on the exception for improved error
-            # reporting
-            e.job_id = job_id
-            e.queue = queue
-            raise e
-        return job, queue
+        while True:
+            queue_keys = [q.key for q in queues]
+            result = cls.lpop(queue_keys, timeout, connection=connection)
+            if result is None:
+                return None
+            queue_key, job_id = map(as_text, result)
+            queue = cls.from_queue_key(queue_key, connection=connection)
+            try:
+                job = cls.job_class.fetch(job_id, connection=connection)
+            except NoSuchJobError:
+                # Silently pass on jobs that don't exist (anymore),
+                # and continue in the look
+                continue
+            except UnpickleError as e:
+                # Attach queue information on the exception for improved error
+                # reporting
+                e.job_id = job_id
+                e.queue = queue
+                raise e
+            return job, queue
+        return None, None
 
     # Total ordering defition (the rest of the required Python methods are
     # auto-generated by the @total_ordering decorator)