kallithea Changeset - 3009a239199d

Changeset - 3009a239199d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 6 years ago 2019-07-21 23:34:47
mads@kiilerich.com

smtp_mailer: clarify that sslerror is ssl.SSLError - slightly clearer, and Python 3 compatible

1 file changed with 4 insertions and 3 deletions:

kallithea/lib/rcmail/smtp_mailer.py

0 comments (0 inline, 0 general)

kallithea/lib/rcmail/smtp_mailer.py

➞

Show inline comments

@@ @@ -25,14 +25,15 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import time
 import logging
 import smtplib
-from socket import sslerror
+from ssl import SSLError
 from email.utils import formatdate
 from kallithea.lib.rcmail.message import Message
 from kallithea.lib.rcmail.utils import DNS_NAME
 class SmtpMailer(object):
     """SMTP mailer class
@@ @@ -97,9 +98,9 @@ class SmtpMailer(object): @@
         smtp_serv.sendmail(msg.sender, msg.send_to, raw_msg.as_string())
         logging.info('MAIL SENT TO: %s' % recipients)
         try:
             smtp_serv.quit()
         except sslerror:
             # sslerror is raised in tls connections on closing sometimes
         except SSLError:
             # SSL error might sometimes be raised in tls connections on closing
             smtp_serv.close()

0 comments (0 inline, 0 general)