Merge pull request spotify#1644 from ej81/master

Raise Queue.Empty for get() on empty queue
puzuwe · Apr 10, 2016 · 826cbfd · 826cbfd
2 parents 927907c + cce8bd1
commit 826cbfd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/luigi/worker.py b/luigi/worker.py
@@ -271,7 +271,10 @@ def put(self, obj, block=None, timeout=None):
         return self.append(obj)
 
     def get(self, block=None, timeout=None):
-        return self.pop()
+        try:
+            return self.pop()
+        except IndexError:
+            raise Queue.Empty
 
 
 class AsyncCompletionException(Exception):