From 3bd23ee96fdff0572568eaa42d69c1ce2e46cc18 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sun, 3 Jul 2011 17:56:05 +0000 Subject: Fixed #15750 -- Handle empty mail server credentials gracefully. Thanks, LeandroSouza and bedmondmark. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16494 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/mail/backends/smtp.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/core/mail/backends/smtp.py b/django/core/mail/backends/smtp.py index bb184ab312..3ee283b5f1 100644 --- a/django/core/mail/backends/smtp.py +++ b/django/core/mail/backends/smtp.py @@ -18,8 +18,14 @@ class EmailBackend(BaseEmailBackend): super(EmailBackend, self).__init__(fail_silently=fail_silently) self.host = host or settings.EMAIL_HOST self.port = port or settings.EMAIL_PORT - self.username = username or settings.EMAIL_HOST_USER - self.password = password or settings.EMAIL_HOST_PASSWORD + if username is None: + self.username = settings.EMAIL_HOST_USER + else: + self.username = username + if password is None: + self.password = settings.EMAIL_HOST_PASSWORD + else: + self.password = password if use_tls is None: self.use_tls = settings.EMAIL_USE_TLS else: -- cgit v1.3