summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-03 13:53:42 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-03 13:53:42 +0000
commitbc6535b5998900191ca8cc8f9755631c4cf1b7f7 (patch)
tree61634f2a6009372d0358517609bcd9597d3d9fd4
parent7a84ad93e69faf7a14342ebb4da1f6be265f1fe0 (diff)
Minor edit of initialisation logic.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/mail.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/mail.py b/django/core/mail.py
index 4c40acda8c..336d1099df 100644
--- a/django/core/mail.py
+++ b/django/core/mail.py
@@ -72,7 +72,7 @@ class SMTPConnection(object):
def __init__(self, host=None, port=None, username=None, password=None,
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.port = 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