summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorPraful Gulani <prafulgulani555@gmail.com>2026-02-12 20:03:25 +0530
committerJacob Walls <jacobtylerwalls@gmail.com>2026-03-16 12:51:58 -0400
commit2333d56696141303000986a16553205ece993c67 (patch)
tree16ec0e70baa0beee82dab88bddf264eaac8ce91e /django/utils
parent455e787b9cc8bd3342f86ddcf8ef4103fd811bb5 (diff)
Fixed #36894 -- Added TypeError for conflicting arguments in mail APIs.
A TypeError is now raised if fail_silently=True, auth_user, or auth_password are provided along a connection. Updated AdminEmailHandler in django.utils.log to remove redundant fail_silently=True. Thanks Mike Edmunds for the report and Jacob Tyler Walls for the review.
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/log.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/log.py b/django/utils/log.py
index d4e96a9816..9a3a7d9f62 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -132,7 +132,7 @@ class AdminEmailHandler(logging.Handler):
reporter.get_traceback_text(),
)
html_message = reporter.get_traceback_html() if self.include_html else None
- self.send_mail(subject, message, fail_silently=True, html_message=html_message)
+ self.send_mail(subject, message, html_message=html_message)
def send_mail(self, subject, message, *args, **kwargs):
mail.mail_admins(