Browse Source

Cosmetics

Ask Solem 13 years ago
parent
commit
0bb16dc6b3
2 changed files with 5 additions and 9 deletions
  1. 0 1
      celery/app/task/__init__.py
  2. 5 8
      celery/worker/job.py

+ 0 - 1
celery/app/task/__init__.py

@@ -737,7 +737,6 @@ class BaseTask(object):
         :keyword consumer: The :class:`~celery.worker.consumer.Consumer`.
 
         """
-        #request.execute(loglevel, logfile)
         request.execute_using_pool(pool, loglevel, logfile)
 
     def __repr__(self):

+ 5 - 8
celery/worker/job.py

@@ -31,10 +31,7 @@ from ..utils.timeutils import maybe_iso8601, timezone
 
 from . import state
 
-#: Keys to keep from the message delivery info.  The values
-#: of these keys must be pickleable.
-WANTED_DELIVERY_INFO = itemgetter("exchange", "routing_key")
-
+# Localize
 tz_to_local = timezone.to_local
 tz_or_local = timezone.tz_or_local
 tz_utc = timezone.utc
@@ -176,10 +173,6 @@ class TaskRequest(object):
                              "retries": retries, "is_eager": False,
                              "delivery_info": delivery_info, "chord": chord}
 
-    @cached_property
-    def tzlocal(self):
-        return tz_or_local(self.app.conf.CELERY_TIMEZONE)
-
     @classmethod
     def from_message(cls, message, body, on_ack=noop, delivery_info={},
             logger=None, hostname=None, eventer=None, app=None,
@@ -466,6 +459,10 @@ class TaskRequest(object):
         first = self.task if use_real else self.name
         return first, self.id, self.args, kwargs
 
+    @cached_property
+    def tzlocal(self):
+        return tz_or_local(self.app.conf.CELERY_TIMEZONE)
+
     @property
     def store_errors(self):
         return (not self.task.ignore_result