Browse Source

generator expressions for 2.4

Jesper Noehr 15 years ago
parent
commit
2b93e5495a

+ 1 - 0
celery/datastructures.py

@@ -1,3 +1,4 @@
+from __future__ import generators
 """
 """
 
 
 Custom Datastructures
 Custom Datastructures

+ 1 - 0
celery/result.py

@@ -1,3 +1,4 @@
+from __future__ import generators
 """
 """
 
 
 Asynchronous result types.
 Asynchronous result types.

+ 1 - 0
celery/utils/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import generators
 """
 """
 
 
 Utility functions
 Utility functions

+ 1 - 0
celery/utils/compat.py

@@ -1,3 +1,4 @@
+from __future__ import generators
 ############## parse_qsl ####################################################
 ############## parse_qsl ####################################################
 try:
 try:
     from urlparse import parse_qsl
     from urlparse import parse_qsl

+ 3 - 0
celery/worker/listener.py

@@ -1,3 +1,4 @@
+from __future__ import generators
 import socket
 import socket
 import warnings
 import warnings
 from datetime import datetime
 from datetime import datetime
@@ -213,6 +214,8 @@ class CarrotListener(object):
         while 1:
         while 1:
             yield self.connection.connection.drain_events()
             yield self.connection.connection.drain_events()
 
 
+        return self._mainloop(**kwargs)
+
     def _detect_wait_method(self):
     def _detect_wait_method(self):
         if hasattr(self.connection.connection, "drain_events"):
         if hasattr(self.connection.connection, "drain_events"):
             self.broadcast_consumer.register_callback(self.receive_message)
             self.broadcast_consumer.register_callback(self.receive_message)

+ 1 - 0
celery/worker/scheduler.py

@@ -1,3 +1,4 @@
+from __future__ import generators
 import time
 import time
 import heapq
 import heapq