Example of modification: old: smtp = smtplib.SMTP(self.mailhost, port, timeout=self._timeout) new: if self.smtps: smtp = smtplib.SMTP_SSL(self.mailhost, port, *self.smtps, timeout=self._timeout) else: smtp = smtplib.SMTP(self.mailhost, port, timeout=self._timeout) old: if self.secure is not None: smtp.ehlo() smtp.starttls(*self.secure) smtp.ehlo() new: smtp.ehlo() if self.tls: smtp.starttls(*self.tls) smtp.ehlo()