cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mail: fixed STARTTLS module working with python 3.7.0 (#47412)

Browse source 
(cherry picked from commit 8c9070ec05)
This commit is contained in:
Konstantin Shalygin 2018-11-06 21:54:51 +07:00 committed by Toshio Kuratomi
parent 71ee1adf0b
commit 0ee072fffc
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/tls_mail.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- fix mail notification module when using starttls and py3.7

8
lib/ansible/modules/notification/mail.py
View file

@ -248,8 +248,8 @@ def main():
try:
if secure != 'never':
try:
smtp = smtplib.SMTP_SSL(host=host, timeout=timeout)
code, smtpmessage = smtp.connect(host, port=port)
smtp = smtplib.SMTP_SSL(host=host, port=port, timeout=timeout)
code, smtpmessage = smtp.connect(host, port)
secure_state = True
except ssl.SSLError as e:
if secure == 'always':
@ -259,8 +259,8 @@ def main():
pass
if not secure_state:
smtp = smtplib.SMTP(timeout=timeout)
code, smtpmessage = smtp.connect(host, port=port)
smtp = smtplib.SMTP(host=host, port=port, timeout=timeout)
code, smtpmessage = smtp.connect(host, port)
except smtplib.SMTPException as e:
module.fail_json(rc=1, msg='Unable to Connect %s:%s: %s' % (host, port, to_native(e)), exception=traceback.format_exc())