CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix #1021 -- Bugs in SMTP test

Browse Source
This commit is contained in:
Raphael Michel
2018-11-05 10:19:29 +01:00
parent 5a29b4bf70
commit aff7094cb0
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/base/email.py
View File

@@ -1,5 +1,5 @@
import logging import logging
from smtplib import SMTPRecipientsRefused, SMTPSenderRefused from smtplib import SMTPResponseException
import bleach import bleach
import markdown import markdown
@@ -23,16 +23,14 @@ class CustomSMTPBackend(EmailBackend):
try: try:
self.open() self.open()
self.connection.ehlo_or_helo_if_needed() self.connection.ehlo_or_helo_if_needed()
self.connection.rcpt("test@example.org")
(code, resp) = self.connection.mail(from_addr, []) (code, resp) = self.connection.mail(from_addr, [])
if code != 250: if code != 250:
logger.warn('Error testing mail settings, code %d, resp: %s' % (code, resp)) logger.warn('Error testing mail settings, code %d, resp: %s' % (code, resp))
raise SMTPSenderRefused(code, resp, from_addr) raise SMTPResponseException(code, resp)
senderrs = {}
(code, resp) = self.connection.rcpt('test@example.com') (code, resp) = self.connection.rcpt('test@example.com')
if (code != 250) and (code != 251): if (code != 250) and (code != 251):
logger.warn('Error testing mail settings, code %d, resp: %s' % (code, resp)) logger.warn('Error testing mail settings, code %d, resp: %s' % (code, resp))
raise SMTPRecipientsRefused(senderrs) raise SMTPResponseException(code, resp)
finally: finally:
self.close() self.close()
@@ -97,7 +95,7 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
@property @property
def template_name(self): def template_name(self):
raise NotImplemented raise NotImplementedError()
def render(self, plain_body: str, plain_signature: str, subject: str, order: Order) -> str: def render(self, plain_body: str, plain_signature: str, subject: str, order: Order) -> str:
body_md = bleach.linkify(markdown_compile(plain_body)) body_md = bleach.linkify(markdown_compile(plain_body))