aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools/mail.py
diff options
context:
space:
mode:
authorJessica Tallon <jessica@megworld.co.uk>2014-08-12 16:56:08 +0100
committerJessica Tallon <jessica@megworld.co.uk>2014-08-12 19:23:19 +0100
commit7ffd4cf4b5e3a1358c189ad49c01a3b3f4198ba4 (patch)
treee54ca8dcc442d13753c2afdb64b7a6ed138aaab7 /mediagoblin/tools/mail.py
parent3b104bbcefca052eb3814f015521b47d2fcbc0da (diff)
downloadmediagoblin-7ffd4cf4b5e3a1358c189ad49c01a3b3f4198ba4.tar.lz
mediagoblin-7ffd4cf4b5e3a1358c189ad49c01a3b3f4198ba4.tar.xz
mediagoblin-7ffd4cf4b5e3a1358c189ad49c01a3b3f4198ba4.zip
Fix #861 - Add unit test and documentation for email_smtp_force_starttls
Diffstat (limited to 'mediagoblin/tools/mail.py')
-rw-r--r--mediagoblin/tools/mail.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tools/mail.py b/mediagoblin/tools/mail.py
index 889a4420..ab355835 100644
--- a/mediagoblin/tools/mail.py
+++ b/mediagoblin/tools/mail.py
@@ -111,7 +111,7 @@ def send_email(from_addr, to_addrs, subject, message_body):
mhost.starttls()
except smtplib.SMTPException:
# Only raise an exception if we're forced to
- if mg_globals.app_config['email_smtp_force_tls']:
+ if mg_globals.app_config['email_smtp_force_starttls']:
six.reraise(*sys.exc_info())
if ((not common.TESTS_ENABLED)