Cosmetics

celery/app/task/__init__.py

@@ -10,7 +10,7 @@ from ...execute.trace import TaskTrace
 from ...registry import tasks, _unpickle_task
 from ...result import EagerResult
 from ...utils import fun_takes_kwargs, mattrgetter, uuid
-from ...utils.mail import ErrorMailSender
+from ...utils.mail import ErrorMail
 
 extract_exec_options = mattrgetter("queue", "routing_key",
                                    "exchange", "immediate",
@@ -103,6 +103,7 @@ class BaseTask(object):
     """
     __metaclass__ = TaskType
 
+    ErrorMail = ErrorMail
     MaxRetriesExceededError = MaxRetriesExceededError
 
     #: The application instance associated with this task class.
@@ -180,7 +181,6 @@ class BaseTask(object):
 
     #: List of exception types to send error emails for.
     error_whitelist = ()
-    ErrorMailSenderClass = ErrorMailSender
 
     #: The name of a serializer that are registered with
     #: :mod:`kombu.serialization.registry`.  Default is `"pickle"`.
@@ -664,7 +664,7 @@ class BaseTask(object):
 
     def send_error_email(self, context, exc, **kwargs):
         if self.send_error_emails and not self.disable_error_emails:
-            sender = self.ErrorMailSenderClass(self, **kwargs)
+            sender = self.ErrorMail(self, **kwargs)
             sender.send(context, exc)
 
     def on_success(self, retval, task_id, args, kwargs):

celery/tests/test_app/test_app.py

@@ -15,7 +15,7 @@ from celery.utils.serialization import pickle
 from celery.tests import config
 from celery.tests.utils import (unittest, mask_modules, platform_pyimp,
                                 sys_platform, pypy_version)
-from celery.utils.mail import ErrorMailSender
+from celery.utils.mail import ErrorMail
 from kombu.utils import gen_unique_id
 
 THIS_IS_A_KEY = "this is a value"
@@ -245,10 +245,10 @@ class test_App(unittest.TestCase):
         self.assertIn("bar_exchange", amqp._exchanges_declared)
 
     def test_error_mail_sender(self):
-        x = ErrorMailSender.subject % {"name": "task_name",
-                                       "id": gen_unique_id(),
-                                       "exc": "FOOBARBAZ",
-                                       "hostname": "lana"}
+        x = ErrorMail.subject % {"name": "task_name",
+                                 "id": gen_unique_id(),
+                                 "exc": "FOOBARBAZ",
+                                 "hostname": "lana"}
         self.assertTrue(x)
 
 

celery/tests/test_concurrency/test_concurrency_eventlet.py

@@ -22,7 +22,7 @@ class test_eventlet_patch(EventletCase):
         monkey_patched = []
         prev_monkey_patch = self.eventlet.monkey_patch
         self.eventlet.monkey_patch = lambda: monkey_patched.append(True)
-        prev_evlet = sys.modules.pop("celery.concurrency.eventlet", None)
+        prev_eventlet = sys.modules.pop("celery.concurrency.eventlet", None)
         os.environ.pop("EVENTLET_NOPATCH")
         try:
             from celery.concurrency import eventlet

celery/utils/mail.py

@@ -79,7 +79,7 @@ class Mailer(object):
         client.sendmail(message.sender, message.to, str(message))
         client.quit()
 
-class ErrorMailSender(object):
+class ErrorMail(object):
 
     # pep8.py borks on a inline signature separator and
     # says "trailing whitespace" ;)
@@ -129,4 +129,4 @@ celeryd at %%(hostname)s.
         if self.should_send(context, exc):
             self.task.app.mail_admins(self.format_subject(context),
                                       self.format_body(context),
-                                      fail_silently=fail_silently)
+                                      fail_silently=fail_silently)

celery/worker/job.py

@@ -210,9 +210,6 @@ class TaskRequest(object):
     #: Format string used to log task retry.
     retry_msg = """Task %(name)s[%(id)s] retry: %(exc)s"""
 
-    email_subject = None
-    email_body = None
-
     #: Timestamp set when the task is started.
     time_start = None
 
@@ -224,8 +221,7 @@ class TaskRequest(object):
 
     def __init__(self, task_name, task_id, args, kwargs,
             on_ack=noop, retries=0, delivery_info=None, hostname=None,
-            email_subject=None, email_body=None, logger=None,
-            eventer=None, eta=None, expires=None, app=None,
+            logger=None, eventer=None, eta=None, expires=None, app=None,
             taskset_id=None, chord=None, **opts):
         self.app = app_or_default(app)
         self.task_name = task_name
@@ -242,8 +238,6 @@ class TaskRequest(object):
         self.hostname = hostname or socket.gethostname()
         self.logger = logger or self.app.log.get_default_logger()
         self.eventer = eventer
-        self.email_subject = email_subject
-        self.email_body = email_body
 
         self.task = registry.tasks[self.task_name]
         self._store_errors = True
@@ -489,10 +483,7 @@ class TaskRequest(object):
                                           "hostname": self.hostname}})
 
         task_obj = registry.tasks.get(self.task_name, object)
-        task_obj.send_error_email(context,
-                                  exc_info.exception,
-                                  subject=self.email_subject,
-                                  body=self.email_body)
+        task_obj.send_error_email(context, exc_info.exception)
 
     def acknowledge(self):
         """Acknowledge task."""