# HG changeset patch # User Mads Kiilerich # Date 2019-07-21 23:34:47 # Node ID 3009a239199ded2e65fa129c5639ca5ab50a0612 # Parent 5bfda9c04db5a4e039877a514f4100aeb7dfd9bb smtp_mailer: clarify that sslerror is ssl.SSLError - slightly clearer, and Python 3 compatible diff --git a/kallithea/lib/rcmail/smtp_mailer.py b/kallithea/lib/rcmail/smtp_mailer.py --- a/kallithea/lib/rcmail/smtp_mailer.py +++ b/kallithea/lib/rcmail/smtp_mailer.py @@ -28,8 +28,9 @@ Original author and date, and relevant c 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 @@ -100,6 +101,6 @@ class SmtpMailer(object): 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()