merge 3.4

This commit is contained in:
Benjamin Peterson 2016-06-11 13:18:56 -07:00
commit b0557e729e
2 changed files with 8 additions and 0 deletions

View file

@ -773,6 +773,11 @@ class SMTP:
self.ehlo_resp = None
self.esmtp_features = {}
self.does_esmtp = 0
else:
# RFC 3207:
# 501 Syntax error (no parameters allowed)
# 454 TLS not available due to temporary reason
raise SMTPResponseException(resp, reply)
return (resp, reply)
def sendmail(self, from_addr, to_addrs, msg, mail_options=[],