Cosmetics

celery/execute/__init__.py

@@ -96,10 +96,8 @@ def apply_async(task, args=None, kwargs=None, countdown=None, eta=None,
     options = router.route(options, task.name, args, kwargs)
     exchange = options.get("exchange")
     exchange_type = options.get("exchange_type")
-    
-    if not expires: # If expires has not been passed to this function, get it from the task (it may still be None)
-        expires = task.expires
-    
+    expires = expires or task.expires
+
     publish = publisher or task.get_publisher(connection, exchange=exchange,
                                               exchange_type=exchange_type)
     try:

celery/task/base.py

@@ -211,6 +211,10 @@ class Task(object):
         The global default can be overriden by the :setting:`CELERY_ACKS_LATE`
         setting.
 
+    .. attribute:: expires
+
+        Default task expiry time in seconds or a :class:`~datetime.datetime`.
+
     """
     __metaclass__ = TaskType