mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #2897 -- Added support for TLS connections to email handling. This means

Browse Source 
servers like Google's SMTP server can now be used for admin emails.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick
2007-05-03 13:35:02 +00:00
parent 21a2ca6a21
commit 7a84ad93e6
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
django/core/mail.py
View File

@@ -70,15 +70,12 @@ class SMTPConnection(object):
"""
def __init__(self, host=None, port=None, username=None, password=None,
fail_silently=False):
if host is None:
self.host = settings.EMAIL_HOST
if port is None:
self.port = settings.EMAIL_PORT
if username is None:
self.username = settings.EMAIL_HOST_USER
if password is None:
self.password = settings.EMAIL_HOST_PASSWORD
use_tls=None, fail_silently=False):
self.host = host or settings.EMAIL_HOST
self.port = (port is not None) and port or settings.EMAIL_PORT
self.username = username or settings.EMAIL_HOST_USER
self.password = password or settings.EMAIL_HOST_PASSWORD
self.use_tls = (use_tls is not None) and use_tls or settings.EMAIL_USE_TLS
self.fail_silently = fail_silently
self.connection = None
@@ -92,6 +89,10 @@ class SMTPConnection(object):
return False
try:
self.connection = smtplib.SMTP(self.host, self.port)
if self.use_tls:
self.connection.ehlo()
self.connection.starttls()
self.connection.ehlo()
if self.username and self.password:
self.connection.login(self.username, self.password)
return True
@@ -104,6 +105,10 @@ class SMTPConnection(object):
try:
try:
self.connection.quit()
except socket.sslerror:
# This happens when calling quit() on a TLS connection
# sometimes.
self.connection.close()
except:
if self.fail_silently:
return