Merge pull request #9199 from Thunderbottom/email-server-ref-fix

fix(email): define email_server before condition
This commit is contained in:
mergify[bot] 2020-01-05 18:58:50 +00:00 committed by GitHub
commit 84c04baa4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -247,13 +247,13 @@ class EmailAccount(Document):
exceptions = []
seen_status = []
uid_reindexed = False
email_server = None
if frappe.local.flags.in_test:
incoming_mails = test_mails
else:
email_sync_rule = self.build_email_sync_rule()
email_server = None
try:
email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule)
except Exception:
@ -305,7 +305,7 @@ class EmailAccount(Document):
raise Exception(frappe.as_json(exceptions))
def handle_bad_emails(self, email_server, uid, raw, reason):
if cint(email_server.settings.use_imap):
if email_server and cint(email_server.settings.use_imap):
import email
try:
mail = email.message_from_string(raw)